From 6e48e72f2732ac2f4c2f79b4643dedf4281b178e Mon Sep 17 00:00:00 2001 From: pmacius Date: Tue, 27 Aug 2024 12:19:13 +0200 Subject: [PATCH] test --- .github/workflows/build_and_test.yml | 3 ++- docker-bake.hcl | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9c9253ae..92fabcb2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -116,7 +116,8 @@ jobs: - name: Bake Docker images uses: docker/bake-action@a4d7f0b5b91c14a296d792d4ec53a9db17f02e67 # v5.5.0 env: - TARGET_ARCH: "[linux/amd64,linux/arm64]" + TARGET_ARCH: >- + ["linux/amd64", "linux/arm64"] with: push: true diff --git a/docker-bake.hcl b/docker-bake.hcl index 9959aa17..6265fd20 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -103,7 +103,7 @@ variable "ALFRESCO_REPO_USER_NAME" { } variable "TARGET_ARCH" { - default = [] # e.g. ["linux/amd64"] + default = [""] # e.g. ["linux/amd64"] } target "java_base" { @@ -139,7 +139,7 @@ target "java_base" { } tags = ["${REGISTRY}/${REGISTRY_NAMESPACE}/alfresco-base-java:${JDIST}${JAVA_MAJOR}-${DISTRIB_NAME}${DISTRIB_MAJOR}"] output = ["type=cacheonly"] - platforms = TARGET_ARCH != "" ? TARGET_ARCH : [] + platforms = "${TARGET_ARCH}" } variable "TOMCAT_MAJOR" { @@ -183,7 +183,7 @@ target "tomcat_base" { } tags = ["${REGISTRY}/${REGISTRY_NAMESPACE}/alfresco-base-tomcat:tomcat${TOMCAT_MAJOR}-${JDIST}${JAVA_MAJOR}-${DISTRIB_NAME}${DISTRIB_MAJOR}"] output = ["type=cacheonly"] - platforms = TARGET_ARCH != "" ? TARGET_ARCH : [] + platforms = "${TARGET_ARCH}" } target "repository" {