diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 439da02..065f03c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,20 +21,23 @@ env: jobs: build-and-push: - runs-on: [ self-hosted, medium, build ] + runs-on: jamesjonesconsulting-arch-gha-set + # runs-on: [ self-hosted, medium, build ] timeout-minutes: 720 container: image: nexus.jamesjonesconsulting.com:5444/podman/stable:latest # image: quay.io/podman/stable:latest - options: --userns=keep-id --group-add keep-groups --privileged --user root - credentials: - username: ${{ secrets.HOME_NEXUS_DOCKER_USER }} - password: ${{ secrets.HOME_NEXUS_DOCKER_PASSWORD }} + options: '--user root' + # options: --userns=keep-id --group-add keep-groups --privileged --user root + # credentials: + # username: ${{ secrets.HOME_NEXUS_DOCKER_USER }} + # password: ${{ secrets.HOME_NEXUS_DOCKER_PASSWORD }} strategy: fail-fast: false max-parallel: 2 matrix: - registry: [ 'ghcr.io', 'nexus.jamesjonesconsulting.com:5443' ] + # registry: [ 'ghcr.io', 'nexus.jamesjonesconsulting.com:5443' ] + registry: [ 'ghcr.io' ] include: - registry: ghcr.io user: GITHUB_DOCKER_USER @@ -42,12 +45,12 @@ jobs: 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 + # - 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 @@ -61,12 +64,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] }} + # - 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