Skip to content

Commit e526f74

Browse files
committed
CI: place environment variables in separate file
1 parent 639b6f3 commit e526f74

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/docker.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
env:
2121
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
2222
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
23-
BASE_DOCKER_IMAGE_NAME: ${{ (github.event.repository.name == 'ps2sdk' && 'ps2toolchain') || (github.event.repository.name == 'ps2sdk-ports' && 'ps2sdk') || (github.event.repository.name == 'ps2-packer' && 'ps2sdk') || (github.event.repository.name == 'ps2dev' && 'ps2sdk-ports') || 'none' }}
2423
outputs:
2524
dest-repo: ${{ steps.dest-repo.outputs.DEST_REPO }}
2625
strategy:
@@ -69,16 +68,19 @@ jobs:
6968
run: |
7069
printf 'DOCKER_TAG_LIST=%s\n' "ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
7170
71+
- name: Prepare additional environment variables from repo
72+
run: if test -f ./config/ci-docker-env.ini; then cat ./config/ci-docker-env.ini | sed -e 's/$REPOSITORY_OWNER/'"${{ github.repository_owner }}"'/g;s/$DOCKER_TAG/'"${{ env.DOCKER_TAG }}"'/g' >> $GITHUB_ENV; fi
73+
7274
- name: Build and Push to container registry
7375
uses: docker/build-push-action@v5
7476
with:
7577
push: true
7678
tags: ${{ env.DOCKER_TAG_LIST }}
7779
build-args: |
78-
BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/${{ env.BASE_DOCKER_IMAGE_NAME }}:${{ env.DOCKER_TAG }}
79-
BASE_DOCKER_DVP_IMAGE=ghcr.io/${{ github.repository_owner }}/ps2toolchain-dvp:${{ env.DOCKER_TAG }}
80-
BASE_DOCKER_IOP_IMAGE=ghcr.io/${{ github.repository_owner }}/ps2toolchain-iop:${{ env.DOCKER_TAG }}
81-
BASE_DOCKER_EE_IMAGE=ghcr.io/${{ github.repository_owner }}/ps2toolchain-ee:${{ env.DOCKER_TAG }}
80+
BASE_DOCKER_IMAGE
81+
BASE_DOCKER_DVP_IMAGE
82+
BASE_DOCKER_IOP_IMAGE
83+
BASE_DOCKER_EE_IMAGE
8284
8385
- name: Gather information for repository dispatch
8486
id: dest-repo

config/ci-docker-env.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
BASE_DOCKER_IMAGE=alpine:latest
3+
BASE_DOCKER_DVP_IMAGE=alpine:latest
4+
BASE_DOCKER_IOP_IMAGE=alpine:latest
5+
BASE_DOCKER_EE_IMAGE=alpine:latest

0 commit comments

Comments
 (0)