mirror of
https://github.com/redhat-actions/push-to-registry.git
synced 2025-02-22 18:21:20 +01:00
fix image namespace for new secrets structure (#47)
Signed-off-by: Tim Etchells <tetchel@gmail.com>
This commit is contained in:
parent
cedd174f01
commit
dff05ea2fa
3 changed files with 14 additions and 11 deletions
15
.github/workflows/multiple-build.yaml
vendored
15
.github/workflows/multiple-build.yaml
vendored
|
@ -6,9 +6,10 @@ on:
|
|||
- cron: '0 0 * * *' # every day at midnight
|
||||
|
||||
env:
|
||||
IMAGE_REGISTRY: quay.io
|
||||
IMAGE_NAMESPACE: redhat-github-actions
|
||||
IMAGE_NAME: myimage
|
||||
IMAGE_TAG: v1
|
||||
IMAGE_REGISTRY: quay.io
|
||||
|
||||
jobs:
|
||||
build-only-podman:
|
||||
|
@ -43,7 +44,7 @@ jobs:
|
|||
with:
|
||||
image: ${{ env.IMAGE_NAME }}
|
||||
tags: ${{ env.IMAGE_TAG }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
|
@ -72,7 +73,7 @@ jobs:
|
|||
|
||||
- name: Build image using Docker
|
||||
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
|
||||
RUN echo "hello world"
|
||||
EOF
|
||||
|
@ -81,9 +82,9 @@ jobs:
|
|||
id: push
|
||||
uses: ./
|
||||
with:
|
||||
image: ${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}
|
||||
image: ${{ env.IMAGE_NAME }}
|
||||
tags: ${{ env.IMAGE_TAG }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
|
@ -130,7 +131,7 @@ jobs:
|
|||
with:
|
||||
image: ${{ env.IMAGE_NAME }}
|
||||
tags: ${{ env.IMAGE_TAG }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
|
@ -177,7 +178,7 @@ jobs:
|
|||
with:
|
||||
image: ${{ env.IMAGE_NAME }}
|
||||
tags: ${{ env.IMAGE_TAG }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
|
|
5
.github/workflows/verify-login-push.yml
vendored
5
.github/workflows/verify-login-push.yml
vendored
|
@ -9,8 +9,9 @@ on:
|
|||
- cron: '0 0 * * *' # every day at midnight
|
||||
|
||||
env:
|
||||
IMAGE_NAME: myimage
|
||||
IMAGE_REGISTRY: quay.io
|
||||
IMAGE_NAMESPACE: redhat-github-actions
|
||||
IMAGE_NAME: myimage
|
||||
IMAGE_TAGS: v1 ${{ github.sha }}
|
||||
|
||||
jobs:
|
||||
|
@ -66,7 +67,7 @@ jobs:
|
|||
with:
|
||||
image: ${{ steps.build_image.outputs.image }}
|
||||
tags: ${{ steps.build_image.outputs.tags }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
extra-args: |
|
||||
--disable-content-trust
|
||||
|
||||
|
|
5
.github/workflows/verify-push.yaml
vendored
5
.github/workflows/verify-push.yaml
vendored
|
@ -10,8 +10,9 @@ on:
|
|||
|
||||
env:
|
||||
PROJECT_DIR: spring-petclinic
|
||||
IMAGE_NAME: spring-petclinic
|
||||
IMAGE_REGISTRY: quay.io
|
||||
IMAGE_NAMESPACE: redhat-github-actions
|
||||
IMAGE_NAME: spring-petclinic
|
||||
IMAGE_TAGS: v1 ${{ github.sha }}
|
||||
MVN_REPO_DIR: ~/.m2/repository
|
||||
|
||||
|
@ -104,7 +105,7 @@ jobs:
|
|||
with:
|
||||
image: ${{ steps.build_image.outputs.image }}
|
||||
tags: ${{ steps.build_image.outputs.tags }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ secrets.REGISTRY_USER }}
|
||||
registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
extra-args: |
|
||||
|
|
Loading…
Add table
Reference in a new issue