@@ -248,6 +248,14 @@ jobs:
248248 docker-publish :
249249 name : Publish to Docker Hub
250250 runs-on : ubuntu-latest
251+ strategy :
252+ fail-fast : false
253+ matrix :
254+ include :
255+ - dockerfile : ./Docker/api-pgsql.Dockerfile
256+ image : ${{ env.IMAGE_NAME }}
257+ - dockerfile : ./Docker/Settings/DB-Admin/pgsql/Dockerfile
258+ image : ${{ env.DATABASE_IMAGE_NAME }}
251259 needs :
252260 - publish-package
253261 steps :
@@ -258,8 +266,6 @@ jobs:
258266 - name : Prepare Tags
259267 id : prepare-tags
260268 run : |
261- BASE="${{ env.IMAGE_NAME }}"
262-
263269 REF="${{ env.REF }}"
264270
265271 if [[ $REF =~ "Pre-Release" ]]
@@ -299,18 +305,19 @@ jobs:
299305 id : meta
300306 uses : docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 # v4.3.0
301307 with :
302- images : |
303- ${{ env.IMAGE_NAME }}
308+ images : ${{ matrix.image }}
309+ # ${{ env.IMAGE_NAME }}
304310 # ${{ env.DATABASE_IMAGE_NAME }}
305311
306312 - name : Build and push admin api image
307313 uses : docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
308314 with :
309- context : " {{defaultContext}}:Docker "
315+ context : " {{defaultContext}}"
310316 cache-from : type=registry,ref=${{ env.IMAGE_NAME }}:pre
311317 cache-to : type=inline
312318 build-args : VERSION=${{ steps.prepare-tags.outputs.VERSION }}
313- file : api-pgsql.Dockerfile
319+ # file: api-pgsql.Dockerfile
320+ file : ${{ matrix.dockerfile }}
314321 tags : ${{ steps.prepare-tags.outputs.TAGS }}
315322 labels : ${{ steps.meta.outputs.labels }}
316323 push : true
0 commit comments