fix image namespace for new secrets structure (#47)

Signed-off-by: Tim Etchells <tetchel@gmail.com>
This commit is contained in:
Tim Etchells 2021-09-13 10:13:29 -07:00 committed by GitHub
parent cedd174f01
commit dff05ea2fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions

View file

@ -6,9 +6,10 @@ on:
- cron: '0 0 * * *' # every day at midnight - cron: '0 0 * * *' # every day at midnight
env: env:
IMAGE_REGISTRY: quay.io
IMAGE_NAMESPACE: redhat-github-actions
IMAGE_NAME: myimage IMAGE_NAME: myimage
IMAGE_TAG: v1 IMAGE_TAG: v1
IMAGE_REGISTRY: quay.io
jobs: jobs:
build-only-podman: build-only-podman:
@ -43,7 +44,7 @@ jobs:
with: with:
image: ${{ env.IMAGE_NAME }} image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAG }} tags: ${{ env.IMAGE_TAG }}
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@ -72,7 +73,7 @@ jobs:
- name: Build image using Docker - name: Build image using Docker
run: | run: |
docker build -t ${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -<<EOF docker build -t ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -<<EOF
FROM busybox FROM busybox
RUN echo "hello world" RUN echo "hello world"
EOF EOF
@ -81,9 +82,9 @@ jobs:
id: push id: push
uses: ./ uses: ./
with: with:
image: ${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }} image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAG }} tags: ${{ env.IMAGE_TAG }}
registry: ${{ env.IMAGE_REGISTRY }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@ -130,7 +131,7 @@ jobs:
with: with:
image: ${{ env.IMAGE_NAME }} image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAG }} tags: ${{ env.IMAGE_TAG }}
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@ -177,7 +178,7 @@ jobs:
with: with:
image: ${{ env.IMAGE_NAME }} image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAG }} tags: ${{ env.IMAGE_TAG }}
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}

View file

@ -9,8 +9,9 @@ on:
- cron: '0 0 * * *' # every day at midnight - cron: '0 0 * * *' # every day at midnight
env: env:
IMAGE_NAME: myimage
IMAGE_REGISTRY: quay.io IMAGE_REGISTRY: quay.io
IMAGE_NAMESPACE: redhat-github-actions
IMAGE_NAME: myimage
IMAGE_TAGS: v1 ${{ github.sha }} IMAGE_TAGS: v1 ${{ github.sha }}
jobs: jobs:
@ -66,7 +67,7 @@ jobs:
with: with:
image: ${{ steps.build_image.outputs.image }} image: ${{ steps.build_image.outputs.image }}
tags: ${{ steps.build_image.outputs.tags }} tags: ${{ steps.build_image.outputs.tags }}
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
extra-args: | extra-args: |
--disable-content-trust --disable-content-trust

View file

@ -10,8 +10,9 @@ on:
env: env:
PROJECT_DIR: spring-petclinic PROJECT_DIR: spring-petclinic
IMAGE_NAME: spring-petclinic
IMAGE_REGISTRY: quay.io IMAGE_REGISTRY: quay.io
IMAGE_NAMESPACE: redhat-github-actions
IMAGE_NAME: spring-petclinic
IMAGE_TAGS: v1 ${{ github.sha }} IMAGE_TAGS: v1 ${{ github.sha }}
MVN_REPO_DIR: ~/.m2/repository MVN_REPO_DIR: ~/.m2/repository
@ -104,7 +105,7 @@ jobs:
with: with:
image: ${{ steps.build_image.outputs.image }} image: ${{ steps.build_image.outputs.image }}
tags: ${{ steps.build_image.outputs.tags }} tags: ${{ steps.build_image.outputs.tags }}
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }} registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
extra-args: | extra-args: |