diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e1b3237..825426f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -42,7 +42,7 @@ jobs: set -euo pipefail podman build \ --pull \ - --label "org.opencontainers.image.base.name=registry.brunner.ninja/feedc0de/php-apache:f76304f1014f15354ec05bba7eaca376993afe72" \ + --label "org.opencontainers.image.base.name=registry.brunner.ninja/feedc0de/php-apache:2.4.69-8.5.11" \ --label "org.opencontainers.image.revision=${COMMIT_SHA}" \ --label "org.opencontainers.image.source=https://code.brunner.ninja/feedc0de/phppgadmin-kubernetes" \ --tag "${IMAGE}:${COMMIT_SHA}" \ @@ -103,10 +103,10 @@ jobs: sh -n install.sh bash -n create-ci-kubeconfig.sh bash -n test.sh - podman run --rm --interactive \ + docker run --rm --interactive \ "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}" \ -strict -ignore-missing-schemas -summary < phppgadmin.yaml - podman run --rm --interactive \ + docker run --rm --interactive \ "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}" \ -strict -summary < ci-deployer.yaml diff --git a/Dockerfile b/Dockerfile index 338894b..43c9251 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG PHP_APACHE_TAG=f76304f1014f15354ec05bba7eaca376993afe72 +ARG PHP_APACHE_TAG=2.4.69-8.5.11 FROM registry.brunner.ninja/feedc0de/php-apache:${PHP_APACHE_TAG} ARG PHPPGADMIN_VERSION=7.14.7