From d6bb48450ea17449088e1a1dfda1bf42ba9b9042 Mon Sep 17 00:00:00 2001 From: Lucius Bachmann Date: Mon, 22 Jun 2026 13:06:47 +0200 Subject: [PATCH] use ghcr registry for commodore images As per decision here: https://kb.vshn.ch/corp-tech/decisions/container-image-location.html#_decision --- gitlab/commodore-compile.jsonnet | 2 +- gitlab/commodore-pipeline.yml | 2 +- gitlab/tests/golden/custom-ssh-port.yml | 4 ++-- gitlab/tests/golden/default.yml | 4 ++-- gitlab/tests/golden/external-catalog.yml | 12 ++++++------ gitlab/tests/golden/k8s-resources.yml | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gitlab/commodore-compile.jsonnet b/gitlab/commodore-compile.jsonnet index 1c22019..e3b2003 100644 --- a/gitlab/commodore-compile.jsonnet +++ b/gitlab/commodore-compile.jsonnet @@ -1,5 +1,5 @@ local commodore_version = 'v1.34.0'; -local commodore_image = 'docker.io/projectsyn/commodore:' + commodore_version; +local commodore_image = 'ghcr.io/projectsyn/commodore:' + commodore_version; local to_array(param) = std.foldl( function(obj, elem) diff --git a/gitlab/commodore-pipeline.yml b/gitlab/commodore-pipeline.yml index ccb5e7a..786c58d 100644 --- a/gitlab/commodore-pipeline.yml +++ b/gitlab/commodore-pipeline.yml @@ -36,7 +36,7 @@ yamllint: commodore-lint: stage: lint image: - name: docker.io/projectsyn/commodore:latest + name: ghcr.io/projectsyn/commodore:latest entrypoint: ["/usr/local/bin/entrypoint.sh"] script: - commodore inventory lint . diff --git a/gitlab/tests/golden/custom-ssh-port.yml b/gitlab/tests/golden/custom-ssh-port.yml index fd98c3c..7949ffe 100644 --- a/gitlab/tests/golden/custom-ssh-port.yml +++ b/gitlab/tests/golden/custom-ssh-port.yml @@ -12,7 +12,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -43,7 +43,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { diff --git a/gitlab/tests/golden/default.yml b/gitlab/tests/golden/default.yml index fd98c3c..7949ffe 100644 --- a/gitlab/tests/golden/default.yml +++ b/gitlab/tests/golden/default.yml @@ -12,7 +12,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -43,7 +43,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { diff --git a/gitlab/tests/golden/external-catalog.yml b/gitlab/tests/golden/external-catalog.yml index f7436e9..eb8af40 100644 --- a/gitlab/tests/golden/external-catalog.yml +++ b/gitlab/tests/golden/external-catalog.yml @@ -12,7 +12,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -43,7 +43,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -79,7 +79,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -110,7 +110,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -146,7 +146,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -175,7 +175,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { diff --git a/gitlab/tests/golden/k8s-resources.yml b/gitlab/tests/golden/k8s-resources.yml index 0566c3e..85d1eb5 100644 --- a/gitlab/tests/golden/k8s-resources.yml +++ b/gitlab/tests/golden/k8s-resources.yml @@ -12,7 +12,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -43,7 +43,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -79,7 +79,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -110,7 +110,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -146,7 +146,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -177,7 +177,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -213,7 +213,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ { @@ -244,7 +244,7 @@ "echo \"$SSH_CONFIG\" >> ~/.ssh/config" ], "image": { - "name": "docker.io/projectsyn/commodore:v1.34.0" + "name": "ghcr.io/projectsyn/commodore:v1.34.0" }, "rules": [ {