Skip to content

Commit d92e6fc

Browse files
- Improve.
1 parent 3caa8ca commit d92e6fc

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,11 +1186,17 @@ jobs:
11861186
openssl req -x509 -keyout cicd/vol/srv/credentials/pg_client_key.pem -out cicd/vol/srv/credentials/pg_client_cert.pem -config test/server/mtls/openssl.cnf -days 365
11871187
openssl req -x509 -keyout cicd/vol/srv/credentials/pg_rubbish_key.pem -out cicd/vol/srv/credentials/pg_rubbish_cert.pem -config test/server/mtls/openssl.cnf -days 365
11881188
1189-
- name: Build image
1189+
- name: Build image precursors
11901190
run: |
11911191
docker compose -f docker-compose-credentials.yml build credentialsgen
11921192
docker compose build mockserver
11931193
1194+
- name: Image env sanitize
1195+
run: |
1196+
{
1197+
echo "IMAGE_PLATFORM_SAN=$( sed 's/\//_/g' <<< '${{ matrix.platform }}' )"
1198+
} >> "${GITHUB_ENV}"
1199+
11941200
- name: Build Stackql image with buildx
11951201
uses: docker/build-push-action@v6
11961202
with:
@@ -1205,7 +1211,7 @@ jobs:
12051211
no-cache: ${{ vars.CI_DOCKER_BUILD_NO_CACHE == 'true' && true || false }}
12061212
load: true
12071213
tags: ${{ env.STACKQL_IMAGE_NAME }}:${{ github.sha }},${{ env.STACKQL_IMAGE_NAME }}:v${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}},${{ env.STACKQL_IMAGE_NAME }}
1208-
outputs: type=docker,dest=${{ runner.temp }}/myimage-${{ matrix.platform }}.tar
1214+
outputs: type=docker,dest=${{ runner.temp }}/myimage-${{ env.IMAGE_PLATFORM_SAN }}.tar
12091215

12101216
- name: Upload artifact
12111217
uses: actions/upload-artifact@v4
@@ -1306,15 +1312,21 @@ jobs:
13061312
- linux/amd64
13071313
- linux/arm64
13081314
steps:
1315+
- name: Image env sanitize
1316+
run: |
1317+
{
1318+
echo "IMAGE_PLATFORM_SAN=$( sed 's/\//_/g' <<< '${{ matrix.platform }}' )"
1319+
} >> "${GITHUB_ENV}"
1320+
13091321
- name: Download artifact
13101322
uses: actions/download-artifact@v4
13111323
with:
1312-
name: myimage-${{ matrix.platform }}
1313-
path: ${{ runner.temp }}/myimage-${{ matrix.platform }}.tar
1324+
name: myimage-${{ env.IMAGE_PLATFORM_SAN }}
1325+
path: ${{ runner.temp }}/myimage-${{ env.IMAGE_PLATFORM_SAN }}.tar
13141326

13151327
- name: Load image
13161328
run: |
1317-
docker load --input ${{ runner.temp }}/myimage-${{ matrix.platform }}.tar
1329+
docker load --input ${{ runner.temp }}/myimage-${{ env.IMAGE_PLATFORM_SAN }}.tar
13181330
docker image ls -a
13191331
13201332
- name: Login to Docker Hub

0 commit comments

Comments
 (0)