modified: .gitea/actions/buildkit-build-push-dev/action.yaml

modified:   .gitea/workflows/ssh-client-build-deploy.yaml

.gitea/actions/buildkit-build-push-dev/action.yaml

@@ -38,51 +38,34 @@ runs:
     - name: run buildctl build and push
       shell: bash
       run: |
-          ###############################################
-          # Create DOCKER_CONFIG for this pipeline
-          ###############################################
+        ###############################################
+        # Build args
+        ###############################################
 
-          DOCKER_CONFIG_DIR="${RUNNER_TEMP}/.buildctl_docker"
-          mkdir -p "$DOCKER_CONFIG_DIR"
+        BUILD_ARG_FLAGS=""
+        while IFS= read -r line; do
+          [[ -z "$line" ]] && continue
+          BUILD_ARG_FLAGS="$BUILD_ARG_FLAGS --opt build-arg:${line}"
+        done <<< "${{ inputs.build_args }}"
 
-          trap 'rm -rf "$DOCKER_CONFIG_DIR"' EXIT
+        echo "Using build args: $BUILD_ARG_FLAGS"
 
-          AUTH=$(printf "%s:%s" "${{ inputs.registry_username }}" "${{ inputs.registry_password }}" | base64 -w0)
+        ###############################################
+        # Inline auth for BuildKit remote push
+        ###############################################
 
-          cat > "$DOCKER_CONFIG_DIR/config.json" <<EOF
-          {
-            "auths": {
-              "${{ inputs.registry_addr }}": {
-                "auth": "$AUTH"
-              }
-            }
-          }
-          EOF
+        AUTH_INLINE=$(printf "%s:%s" "${{ inputs.registry_username }}" "${{ inputs.registry_password }}" | base64 -w0)
 
-          ###############################################
-          # Build args
-          ###############################################
+        ###############################################
+        # Build + push using BuildKit REMOTE + INLINE AUTH
+        ###############################################
 
-          BUILD_ARG_FLAGS=""
-          while IFS= read -r line; do
-            [[ -z "$line" ]] && continue
-            BUILD_ARG_FLAGS="$BUILD_ARG_FLAGS --opt build-arg:${line}"
-          done <<< "${{ inputs.build_args }}"
-
-          echo "Using build args: $BUILD_ARG_FLAGS"
-
-          ###############################################
-          # Build + push using BuildKit REMOTE + SECRET
-          ###############################################
-
-          buildctl \
-            --addr ${{ inputs.buildkit_addr }} \
-            build \
-            --frontend=dockerfile.v0 \
-            --local context=${{ inputs.context }} \
-            --local dockerfile=${{ inputs.dockerfile }} \
-            --opt filename=${{ inputs.filename }} \
-            $BUILD_ARG_FLAGS \
-            --secret id=harbor,src=$DOCKER_CONFIG_DIR/config.json \
-            --opt secret=harbor \
-            --output type=image,name=${{ inputs.tags }},push=true
+        buildctl \
+          --addr ${{ inputs.buildkit_addr }} \
+          build \
+          --frontend=dockerfile.v0 \
+          --local context=${{ inputs.context }} \
+          --local dockerfile=${{ inputs.dockerfile }} \
+          --opt filename=${{ inputs.filename }} \
+          $BUILD_ARG_FLAGS \
+          --output type=image,name=${{ inputs.tags }},push=true,registry.auth=$AUTH_INLINE

.gitea/workflows/ssh-client-build-deploy.yaml

@@ -16,6 +16,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+
       - name: Fetch limbo public actions
         env: 
           RUNNER_TEMP: "${{ runner.temp }}"
@@ -33,5 +34,5 @@ jobs:
           buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
           dockerfile: ${{gitea.workspace}}/docker/ssh-client
           context: ${{gitea.workspace}}/docker/ssh-client
-          
+