diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01997f8..7da2914 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,7 @@ on: env: GITHUB_DOCKER_USER: ${{ github.actor }} NEXUS_DOCKER_USER: ${{ secrets.HOME_NEXUS_DOCKER_USER }} + NEXUS_PROXY_REGISTRY: nexus.jamesjonesconsulting.com:5444 jobs: build-and-push: @@ -33,9 +34,15 @@ jobs: - registry: ghcr.io user: GITHUB_DOCKER_USER password: GITHUB_TOKEN + registry_proxy: NEXUS_PROXY_REGISTRY + proxy_user: NEXUS_DOCKER_USER + proxy_password: HOME_NEXUS_DOCKER_PASSWORD - registry: nexus.jamesjonesconsulting.com:5443 user: NEXUS_DOCKER_USER password: HOME_NEXUS_DOCKER_PASSWORD + registry_proxy: NEXUS_PROXY_REGISTRY + proxy_user: NEXUS_DOCKER_USER + proxy_password: HOME_NEXUS_DOCKER_PASSWORD steps: # Downloads a copy of the code in your repository before running CI tests - name: Check out repository code @@ -49,6 +56,12 @@ jobs: login-server: ${{ matrix.registry }} username: ${{ env[matrix.user] }} password: ${{ secrets[matrix.password] }} + - name: Docker Login + uses: azure/docker-login@v1 + with: + login-server: ${{ matrix.registry_proxy }} + username: ${{ env[matrix.proxy_user] }} + password: ${{ secrets[matrix.proxy_password] }} # This requires docker buildx which podman doesn't support # - name: Extract metadata (tags, labels) for Docker # id: meta @@ -70,7 +83,7 @@ jobs: else VERSION=$(echo "${GITHUB_REF_NAME}" | sed 's|/|-|g') fi - podman build . --file Dockerfile --tag "${{ matrix.registry }}/$IMAGE_NAME:$VERSION" --build-arg ARTIFACTORY=${{ matrix.registry }} + podman build . --file Dockerfile --tag "${{ matrix.registry }}/$IMAGE_NAME:$VERSION" --build-arg ARTIFACTORY=${{ matrix.registry_proxy }} podman push "${{ matrix.registry }}/$IMAGE_NAME:$VERSION" if [[ "$GITHUB_REF" =~ ^refs/tags.* ]]; then podman tag "${{ matrix.registry }}/$IMAGE_NAME:$VERSION" "${{ matrix.registry }}/$IMAGE_NAME:latest"