Skip to content

Commit 1d7b7b4

Browse files
committed
fix(runtime): pin postgres DHI mirror digest
1 parent 1062e27 commit 1d7b7b4

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/mirror-hardened-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
target: ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22
3838
package: terrarium-dhi-postgres
3939
source_digest: sha256:53e316c761bfcaae02cdc6015c3a11a747fe9d0cde9cd0c3d4c871326862e7ed
40-
target_digest: auto
40+
target_digest: sha256:de305976d6a81c4c1ad260861ec5028faafbb1be0bca68ab379eb2fb621abe34
4141
arches: amd64,arm64
4242
env:
4343
REGISTRY_AUTH_FILE: /tmp/terrarium-containers-auth.json

ansible/roles/idp_zitadel/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ terrarium_docker_hardened_images: auto
1515
terrarium_docker_hardened_image_mirrors: true
1616
terrarium_zitadel_postgres_image: ""
1717
terrarium_zitadel_postgres_image_hardened: "dhi.io/postgres:17.9-alpine3.22@sha256:53e316c761bfcaae02cdc6015c3a11a747fe9d0cde9cd0c3d4c871326862e7ed"
18-
terrarium_zitadel_postgres_image_mirror: "ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22"
18+
terrarium_zitadel_postgres_image_mirror: "ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22@sha256:de305976d6a81c4c1ad260861ec5028faafbb1be0bca68ab379eb2fb621abe34"
1919
terrarium_zitadel_postgres_image_fallback: "postgres:17.9-alpine3.22@sha256:034839bd88128360cda25496ebdb1471e24a4aa09b937160c73df2bb51126308"
2020
terrarium_zitadel_pat_expiration: "2099-01-01T00:00:00Z"
2121
terrarium_zitadel_project_name: Terrarium

ansible/site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
terrarium_oauth2_proxy_image_fallback: "quay.io/oauth2-proxy/oauth2-proxy:v7.15.2@sha256:aa0bd8dd5ab0c78e4c91c92755ad573a5f92241f88138b4141b8ec803463b4fd"
5959
terrarium_zitadel_postgres_image: ""
6060
terrarium_zitadel_postgres_image_hardened: "dhi.io/postgres:17.9-alpine3.22@sha256:53e316c761bfcaae02cdc6015c3a11a747fe9d0cde9cd0c3d4c871326862e7ed"
61-
terrarium_zitadel_postgres_image_mirror: "ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22"
61+
terrarium_zitadel_postgres_image_mirror: "ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22@sha256:de305976d6a81c4c1ad260861ec5028faafbb1be0bca68ab379eb2fb621abe34"
6262
terrarium_zitadel_postgres_image_fallback: "postgres:17.9-alpine3.22@sha256:034839bd88128360cda25496ebdb1471e24a4aa09b937160c73df2bb51126308"
6363
terrarium_email: ""
6464
terrarium_acme_email: "{{ terrarium_email }}"

tests/ansible-bootstrap-cert.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const repoRoot = join(import.meta.dir, "..");
66
const POSTGRES_DHI_IMAGE =
77
"dhi.io/postgres:17.9-alpine3.22@sha256:53e316c761bfcaae02cdc6015c3a11a747fe9d0cde9cd0c3d4c871326862e7ed";
88
const POSTGRES_MIRROR_IMAGE =
9-
"ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22";
9+
"ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22@sha256:de305976d6a81c4c1ad260861ec5028faafbb1be0bca68ab379eb2fb621abe34";
1010
const POSTGRES_FALLBACK_IMAGE =
1111
"postgres:17.9-alpine3.22@sha256:034839bd88128360cda25496ebdb1471e24a4aa09b937160c73df2bb51126308";
1212

tests/hardened-image-mirror.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ describe("Docker Hardened Image mirror workflow", () => {
2929
expect(workflow).toContain(`target_digest: ${OAUTH2_PROXY_MIRROR_DIGEST}`);
3030
expect(workflow).toContain(`dhi.io/postgres@${POSTGRES_DIGEST}`);
3131
expect(workflow).not.toContain("17.9-alpine3.22-fips");
32-
expect(workflow).toContain(`ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22`);
32+
expect(workflow).toContain("target: ghcr.io/terion-name/terrarium-dhi-postgres:17.9-alpine3.22");
3333
expect(workflow).toContain(`source_digest: ${POSTGRES_DIGEST}`);
34-
expect(workflow.match(/target_digest: auto/g)).toHaveLength(1);
34+
expect(workflow.match(/target_digest: sha256:de305976d6a81c4c1ad260861ec5028faafbb1be0bca68ab379eb2fb621abe34/g)).toHaveLength(1);
3535
expect(workflow.match(/arches: amd64,arm64/g)).toHaveLength(2);
3636

3737
expect(script).toContain("skopeo inspect --raw");

0 commit comments

Comments
 (0)