Fixup build strategy

This commit is contained in:
Greyscale 2024-05-20 00:58:51 +02:00
parent 4e4615c87c
commit 2c01f6c446
3 changed files with 8 additions and 8 deletions

View file

@ -30,8 +30,6 @@ jobs:
with:
context: .
target: bouncer
build-contexts: |
php:cli=docker-image://ghcr.io/benzine-framework/php:cli-${{ env.PHP_VERSION }}
build-args: |
GIT_SHA=${{ github.sha }}
GIT_BUILD_ID=${{ github.ref_name }}

View file

@ -26,9 +26,7 @@ jobs:
dry-run: true
prune-tags-regexes: |
^build-${{ github.sha }}$
keep-tags-regexes: |
^v
^latest$
cleanup-untagged-images:
name: Delete untagged images
runs-on: ubuntu-latest
@ -40,6 +38,10 @@ jobs:
organization: ${{ github.repository_owner }}
container: bouncer
dry-run: true
keep-younger-than: 7 # days
keep-younger-than: 30 # days
keep-last: 2
prune-untagged: true
keep-tags-regexes: |
^v
^latest$
^old$

View file

@ -1,5 +1,5 @@
# checkov:skip=CKV_DOCKER_3 I don't have time for rootless
FROM php:cli as bouncer
FROM ghcr.io/benzine-framework/php:cli-8.2 AS bouncer
LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
org.label-schema.vcs-url="https://github.com/benzine-framework/docker-swarm-loadbalancer" \
@ -97,7 +97,7 @@ HEALTHCHECK --start-period=30s \
CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1
# checkov:skip=CKV_DOCKER_3 This is a test container.
FROM php:nginx as test-app
FROM ghcr.io/benzine-framework/php:nginx-8.2 AS test-app
COPY tests/testsites /app/public
HEALTHCHECK --start-period=3s --interval=3s \
CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1