From a677ab6d9d0ff3bd2039b7a9b111795688cf9f06 Mon Sep 17 00:00:00 2001
From: Mathias Beaulieu-Duncan <mathias@openharbor.io>
Date: Tue, 3 Feb 2026 16:45:18 -0500
Subject: [PATCH] Fix registry secret names and add busybox to SDK

Use REGISTRY_USERNAME/REGISTRY_PASSWORD instead of
DOCKERHUB_SVRNTY_USERNAME/DOCKERHUB_SVRNTY_ACCESS_TOKEN.
Add busybox to SDK apko config for /bin/sh support.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .gitea/workflows/build.yaml        | 4 ++--
 .gitea/workflows/scout.yaml        | 8 ++++----
 .gitea/workflows/update-check.yaml | 4 ++--
 apko/sdk.yaml                      | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index f70f7b4..dbaa0f2 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -91,8 +91,8 @@ jobs:
       - name: Log in to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_SVRNTY_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_SVRNTY_ACCESS_TOKEN }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Build apko base images
         run: |
diff --git a/.gitea/workflows/scout.yaml b/.gitea/workflows/scout.yaml
index 0611432..9e74566 100644
--- a/.gitea/workflows/scout.yaml
+++ b/.gitea/workflows/scout.yaml
@@ -20,8 +20,8 @@ jobs:
       - name: Log in to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_SVRNTY_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_SVRNTY_ACCESS_TOKEN }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Check if latest runtime-lts image exists
         id: check
@@ -57,8 +57,8 @@ jobs:
       - name: Log in to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_SVRNTY_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_SVRNTY_ACCESS_TOKEN }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Discover latest LTS version
         id: discover
diff --git a/.gitea/workflows/update-check.yaml b/.gitea/workflows/update-check.yaml
index eeb9798..646ede1 100644
--- a/.gitea/workflows/update-check.yaml
+++ b/.gitea/workflows/update-check.yaml
@@ -19,8 +19,8 @@ jobs:
       - name: Log in to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_SVRNTY_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_SVRNTY_ACCESS_TOKEN }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Check for new .NET versions
         id: check
diff --git a/apko/sdk.yaml b/apko/sdk.yaml
index 8b804f9..c9e55ce 100644
--- a/apko/sdk.yaml
+++ b/apko/sdk.yaml
@@ -12,6 +12,7 @@ contents:
     - zlib
     - icu
     - tzdata
+    - busybox
     - bash
     - git
     - curl