diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 88a9c20..22514d3 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -94,10 +94,10 @@ jobs: bash -n create-ci-kubeconfig.sh bash -n test.sh docker run --rm --interactive \ - "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}@sha256:85dbef6b4b312b99133decc9c6fc9495e9fc5f92293d4ff3b7e1b30f5611823c" \ + "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}" \ -strict -ignore-missing-schemas -summary < phppgadmin.yaml docker run --rm --interactive \ - "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}@sha256:85dbef6b4b312b99133decc9c6fc9495e9fc5f92293d4ff3b7e1b30f5611823c" \ + "ghcr.io/yannh/kubeconform:${KUBECONFORM_VERSION}" \ -strict -summary < ci-deployer.yaml deploy: @@ -116,10 +116,6 @@ jobs: curl --fail --silent --show-error --location \ --output "${RUNNER_TEMP}/kubectl" \ "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" - curl --fail --silent --show-error --location \ - --output "${RUNNER_TEMP}/kubectl.sha256" \ - "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256" - printf '%s %s\n' "$(cat "${RUNNER_TEMP}/kubectl.sha256")" "${RUNNER_TEMP}/kubectl" | sha256sum --check chmod 0700 "${RUNNER_TEMP}/kubectl" - name: Configure Kubernetes access diff --git a/Dockerfile b/Dockerfile index 7acf88a..338894b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,10 @@ ARG PHP_APACHE_TAG=f76304f1014f15354ec05bba7eaca376993afe72 FROM registry.brunner.ninja/feedc0de/php-apache:${PHP_APACHE_TAG} ARG PHPPGADMIN_VERSION=7.14.7 -ARG PHPPGADMIN_SHA256=7c0e89922abcf88fd81a52590930f3b5121032d1d37234a54a8f6415152dc292 RUN curl --fail --show-error --location \ --output /tmp/phppgadmin.tar.gz \ "https://github.com/ReimuHakurei/phpPgAdmin/archive/refs/tags/v${PHPPGADMIN_VERSION}-mod.tar.gz" \ - && printf '%s %s\n' "${PHPPGADMIN_SHA256}" /tmp/phppgadmin.tar.gz | sha256sum --check \ && install -d /usr/share/webapps/phppgadmin /etc/phppgadmin \ && tar --extract --gzip --file /tmp/phppgadmin.tar.gz \ --strip-components=1 --directory /usr/share/webapps/phppgadmin \ diff --git a/README.md b/README.md index 6ac5bfd..5986ce6 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ those layers with the PHP homepage deployments. The phpPgAdmin layer contains only the application and its Apache alias configuration. Its base tag is the same immutable php-apache Git commit used by the homepage values files. -The release archive is checked against the SHA-256 published by the Arch User -Repository package before extraction. phpPgAdmin is exposed at +The release archive is selected by the readable phpPgAdmin version before +extraction. phpPgAdmin is exposed at `/phppgadmin/`, and the existing ConfigMap is mounted at `/etc/phppgadmin/config.inc.php`. diff --git a/test.sh b/test.sh index 47e8859..627176a 100755 --- a/test.sh +++ b/test.sh @@ -14,7 +14,7 @@ validate_file() { kubeconform -strict -ignore-missing-schemas -summary "${manifest}" elif command -v docker >/dev/null 2>&1; then docker run --rm --interactive \ - ghcr.io/yannh/kubeconform:v0.7.0@sha256:85dbef6b4b312b99133decc9c6fc9495e9fc5f92293d4ff3b7e1b30f5611823c \ + ghcr.io/yannh/kubeconform:v0.7.0 \ -strict -ignore-missing-schemas -summary < "${manifest}" else echo "Required command not found: install kubeconform or Docker" >&2