@@ -146,8 +146,10 @@ jobs:
146146 tags : |
147147 docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-slim
148148 docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
149- # ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-slim
150- # quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-slim
149+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-slim-${{env.COMMIT_HASH}}
150+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim-${{env.COMMIT_HASH}}
151+ # ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
152+ # quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
151153
152154
153155 # --------------------------------------------------
@@ -210,5 +212,73 @@ jobs:
210212 tags : |
211213 docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm
212214 docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian
213- # ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm
214- # quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm
215+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-${{env.COMMIT_HASH}}
216+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-${{env.COMMIT_HASH}}
217+ # ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian
218+ # quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian
219+
220+
221+ # --------------------------------------------------
222+ # JOB: Derived-Image: php-wsc
223+ # --------------------------------------------------
224+ build-php-wsc :
225+ name : Build php-wsc (PHP ${{ matrix.php }})
226+ runs-on : ubuntu-latest
227+ needs :
228+ - prepare
229+ - build-php-slim
230+
231+ strategy :
232+ fail-fast : false
233+ matrix :
234+ php : ${{ fromJson(needs.prepare.outputs.php_matrix) }}
235+
236+ env :
237+ BUILD_DATE : ${{ needs.prepare.outputs.build_date }}
238+ BUILD_DATE_NUMERIC : ${{ needs.prepare.outputs.build_date_numeric}}
239+ COMMIT_HASH : ${{ needs.prepare.outputs.commit_hash }}
240+ GIT_URL : ${{ needs.prepare.outputs.git_url }}
241+ GIT_REPO : ${{ needs.prepare.outputs.git_repo }}
242+ GIT_REPO_SHORT : ${{ needs.prepare.outputs.git_repo_short }}
243+ DOCKER_REPO : ${{ needs.prepare.outputs.docker_repo }}
244+ QUAY_REPO : ${{ needs.prepare.outputs.quay_repo }}
245+ PHP_VERSION : ${{ matrix.php }}
246+
247+ steps :
248+ - name : Checkout
249+ uses : actions/checkout@v6
250+
251+ - name : Execute Docker Setup
252+ id : docker-setup
253+ uses : ./.github/actions/docker-setup
254+ # uses: tob1as/docker-build-example/.github/actions/docker-setup@main
255+ with :
256+ git_url : ${{ env.GIT_URL }}
257+ git_username : ${{ github.repository_owner }}
258+ git_token : ${{ secrets.GITHUB_TOKEN }}
259+ docker_username : ${{ vars.DOCKER_USERNAME }}
260+ docker_password : ${{ secrets.DOCKER_PASSWORD }}
261+ quay_username : ${{ vars.REDHAT_QUAY_USERNAME }}
262+ quay_password : ${{ secrets.REDHAT_QUAY_PASSWORD }}
263+
264+ - name : Build
265+ uses : docker/build-push-action@v6
266+ with :
267+ builder : ${{ steps.docker-setup.outputs.builder_name }}
268+ context : .
269+ file : ./debian.fpm.wsc.Dockerfile
270+ platforms : linux/amd64,linux/arm64,linux/arm/v7
271+ pull : true
272+ push : true
273+ # target: runtime
274+ build-args : |
275+ BUILD_DATE=${{ env.BUILD_DATE }}
276+ VCS_REF=${{ env.COMMIT_HASH }}
277+ PHP_VERSION=${{ env.PHP_VERSION }}
278+ tags : |
279+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-wsc
280+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
281+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-wsc-${{env.COMMIT_HASH}}
282+ docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc-${{env.COMMIT_HASH}}
283+ # ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
284+ # quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
0 commit comments