diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 278a963..cd21850 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -48,21 +48,13 @@ jobs: - uses: actions/checkout@v4 - - name: Install Docker + - name: Install skopeo run: | mkdir -p ~/.local/bin - nix build -I nixpkgs=channel:nixos-unstable nixpkgs#docker -o ~/.local/docker - ln -sf ~/.local/docker/bin/docker ~/.local/bin/docker + nix build -I nixpkgs=channel:nixos-unstable nixpkgs#skopeo -o ~/.local/skopeo + ln -sf ~/.local/skopeo/bin/skopeo ~/.local/bin/skopeo echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ env.GITHUB_ACTOR }} - password: ${{ env.GITHUB_TOKEN }} - - name: Extract Docker metadata id: meta uses: docker/metadata-action@v5 @@ -72,22 +64,38 @@ jobs: - name: Build Nix package run: nix build .#my-docker - # https://github.com/orgs/community/discussions/25768#discussioncomment-3249183 - name: Downcase REPO run: | echo "REPO=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV} - - name: Strip REPO Username + - name: Set image name run: | - STRIP_REPO_USERNAME=${REPO#nexveridian/} - echo "STRIP_REPO_USERNAME=${STRIP_REPO_USERNAME}" >> ${GITHUB_ENV} + # Use the full repository name for Forgejo packages + echo "IMAGE_NAME=${{ env.REPO }}" >> ${GITHUB_ENV} - # https://github.com/docker/build-push-action/issues/538 - - name: Push and tag Docker image + - name: Push Docker image with skopeo run: | - docker load < result - docker tag ${{ env.STRIP_REPO_USERNAME }}:latest ${{ env.REGISTRY }}/${{ env.REPO }}:latest - docker push ${{ env.REGISTRY }}/${{ env.REPO }}:latest + # Create required temp directories + mkdir -p /var/tmp + IMAGE_PATH=$(readlink -f result) + echo "Pushing image from: $IMAGE_PATH" + echo "Target registry: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" + echo "Using actor: ${{ github.actor }}" + + # Debug token permissions + echo "Checking token permissions..." + curl -H "Authorization: token ${{ github.token }}" \ + -I "https://${{ env.REGISTRY }}/v2/" || echo "Registry auth check failed" + + # Login first + echo "${{ github.token }}" | skopeo login --username "${{ github.actor }}" --password-stdin "${{ env.REGISTRY }}" + + # Try copy with explicit credentials even after login + skopeo copy \ + --insecure-policy \ + --dest-creds "${{ github.actor }}:${{ github.token }}" \ + "docker-archive://$IMAGE_PATH" \ + "docker://${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" - name: Push to attic if: always()