From f55466a1b7c4493d2ef9af6192efbe77e64fa10c Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Thu, 19 Jun 2025 09:00:46 +0200 Subject: [PATCH] remove cache-from and cache-to --- .../docker-compose-ci.yaml | 36 -------------- .../login-test-acceptance/docker-compose.yaml | 30 ------------ docker-bake-ci.hcl | 49 ------------------- docker-bake.hcl | 32 ------------ 4 files changed, 147 deletions(-) delete mode 100644 apps/login-test-acceptance/docker-compose-ci.yaml delete mode 100644 docker-bake-ci.hcl diff --git a/apps/login-test-acceptance/docker-compose-ci.yaml b/apps/login-test-acceptance/docker-compose-ci.yaml deleted file mode 100644 index 12e4c48c2e..0000000000 --- a/apps/login-test-acceptance/docker-compose-ci.yaml +++ /dev/null @@ -1,36 +0,0 @@ -services: - setup: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-setup-buildcache:${REF_TAG},mode=max,oci-mediatypes=true - - sink: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-sink-buildcache:${REF_TAG},mode=max,oci-mediatypes=true - - oidcrp: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcrp-buildcache:${REF_TAG},mode=max,oci-mediatypes=true - - oidcop: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcop-buildcache:${REF_TAG},mode=max,oci-mediatypes=true - - samlsp: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlsp-buildcache:${REF_TAG},mode=max,oci-mediatypes=true - - samlidp: - build: - x-bake: - cache-to: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlidp-buildcache:${REF_TAG},mode=max,oci-mediatypes=true diff --git a/apps/login-test-acceptance/docker-compose.yaml b/apps/login-test-acceptance/docker-compose.yaml index 6c731da1c5..1cbf82f8af 100644 --- a/apps/login-test-acceptance/docker-compose.yaml +++ b/apps/login-test-acceptance/docker-compose.yaml @@ -76,11 +76,6 @@ services: build: context: "${LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT:-.}/setup" dockerfile: ../go-command.Dockerfile - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-setup-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-setup-buildcache:latest entrypoint: "./setup.sh" environment: PAT_FILE: /pat/zitadel-admin-sa.pat @@ -125,11 +120,6 @@ services: dockerfile: ../go-command.Dockerfile args: - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-sink-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-sink-buildcache:latest environment: PORT: '3333' command: @@ -155,11 +145,6 @@ services: dockerfile: ../go-command.Dockerfile args: - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcrp-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcrp-buildcache:latest environment: API_URL: 'http://traefik' API_DOMAIN: 'traefik' @@ -187,11 +172,6 @@ services: dockerfile: ../../go-command.Dockerfile args: - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcop-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-oidcop-buildcache:latest environment: API_URL: 'http://traefik' API_DOMAIN: 'traefik' @@ -217,11 +197,6 @@ services: dockerfile: ../go-command.Dockerfile args: - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlsp-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlsp-buildcache:latest environment: API_URL: 'http://traefik' API_DOMAIN: 'traefik' @@ -246,11 +221,6 @@ services: dockerfile: ../../go-command.Dockerfile args: - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - x-bake: - output: "type=docker" - cache-from: - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlidp-buildcache:${REF_TAG} - - type=registry,ref=ghcr.io/zitadel/login-test-acceptance-samlidp-buildcache:latest environment: API_URL: 'http://traefik:8080' API_DOMAIN: 'traefik' diff --git a/docker-bake-ci.hcl b/docker-bake-ci.hcl deleted file mode 100644 index ebfc6a7d19..0000000000 --- a/docker-bake-ci.hcl +++ /dev/null @@ -1,49 +0,0 @@ -target "docker-metadata-action" {} - -target "login-pnpm" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-pnpm-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-dev-base" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-dev-base-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-lint" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-lint-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-test-unit" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-test-unit-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-test-integration" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-test-integration-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-client" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-client-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-test-acceptance" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-test-acceptance-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} - -target "login-standalone" { - cache-to = [ - { type: "registry", ref: "${IMAGE_REGISTRY}/login-buildcache:${REF_TAG}", mode: "max", oci-mediatypes=true } - ] -} diff --git a/docker-bake.hcl b/docker-bake.hcl index 01bda1f33a..8f69ea04f2 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -9,18 +9,10 @@ variable "REF_TAG" { } target "login-pnpm" { - cache-from = [ - { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${REF_TAG}" }, - { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:latest" }, - ] dockerfile = "dockerfiles/login-pnpm.Dockerfile" } target "login-dev-base" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-dev-base.Dockerfile" contexts = { login-pnpm = "target:login-pnpm" @@ -28,10 +20,6 @@ target "login-dev-base" { } target "login-lint" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-lint.Dockerfile" contexts = { login-dev-base = "target:login-dev-base" @@ -39,10 +27,6 @@ target "login-lint" { } target "login-test-unit" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-unit-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-unit-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-test-unit.Dockerfile" contexts = { login-client = "target:login-client" @@ -50,10 +34,6 @@ target "login-test-unit" { } target "login-client" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-client-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-client-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-client.Dockerfile" contexts = { login-pnpm = "target:login-pnpm" @@ -97,10 +77,6 @@ variable "LOGIN_TEST_INTEGRATION_TAG" { } target "login-test-integration" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-integration-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-integration-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-test-integration.Dockerfile" contexts = { login-pnpm = "target:login-pnpm" @@ -114,10 +90,6 @@ variable "LOGIN_TEST_ACCEPTANCE_TAG" { } target "login-test-acceptance" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-acceptance-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-test-acceptance-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-test-acceptance.Dockerfile" contexts = { login-pnpm = "target:login-pnpm" @@ -132,10 +104,6 @@ variable "LOGIN_TAG" { # We run integration and acceptance tests against the next standalone server for docker. target "login-standalone" { - cache-from = [ - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-buildcache:${REF_TAG}"}, - {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-buildcache:latest"}, - ] dockerfile = "dockerfiles/login-standalone.Dockerfile" contexts = { login-client = "target:login-client"