diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 303ba69..ced5574 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -167,20 +167,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Configure Docker daemon for plain HTTP registry - if: needs.metadata.outputs.registry_plain_http == 'true' - uses: docker/setup-docker-action@v4 - with: - daemon-config: | - { - "features": { - "containerd-snapshotter": true - }, - "insecure-registries": [ - "${{ needs.metadata.outputs.registry }}" - ] - } - - name: Setup Docker Buildx if: needs.metadata.outputs.registry_plain_http != 'true' uses: docker/setup-buildx-action@v3 @@ -205,13 +191,18 @@ jobs: username="${REGISTRY_USERNAME:-${{ github.actor }}}" password="${REGISTRY_PASSWORD:-${GITHUB_TOKEN_FALLBACK:-}}" registry="${{ needs.metadata.outputs.registry }}" + login_registry="$registry" if [ -z "$password" ]; then echo "Set CONTAINER_REGISTRY_PASSWORD or enable GITHUB_TOKEN package writes" exit 1 fi - printf '%s' "$password" | docker login "$registry" \ + if [ "${{ needs.metadata.outputs.registry_plain_http }}" = "true" ]; then + login_registry="http://${registry}" + fi + + printf '%s' "$password" | docker login "$login_registry" \ --username "$username" \ --password-stdin