From eb1dd6cd326363052bea6cc1fa0812d52a00fbae Mon Sep 17 00:00:00 2001 From: Carmine Vassallo Date: Fri, 31 Jan 2025 10:47:46 +0100 Subject: [PATCH] add docker type --- .cirrus/tasks_gcp_marketplace.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus/tasks_gcp_marketplace.yml b/.cirrus/tasks_gcp_marketplace.yml index 2bb30a64f..01ac3eacd 100644 --- a/.cirrus/tasks_gcp_marketplace.yml +++ b/.cirrus/tasks_gcp_marketplace.yml @@ -13,8 +13,8 @@ build_gcp_app_template: &BUILD_GCP_APP_TEMPLATE - ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce tag_and_promote_script: - export CURRENT_MINOR_VERSION=$(echo ${GCLOUD_TAG} | cut -d '.' -f 1,2) - - docker buildx create --use - - docker buildx build --platform linux/amd64 --annotation "index,manifest,manifest-descriptor,index-descriptor:com.googleapis.cloudmarketplace.product.service.name=services/official-sonarqube-data-center-edition.endpoints.sonarsource-public.cloud.goog" -f google-cloud-marketplace-k8s-app/Dockerfile --build-arg REGISTRY=${GCLOUD_REGISTRY} --build-arg TAG=${GCLOUD_TAG} --tag ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/deployer:${CURRENT_MINOR_VERSION} --tag ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/deployer:${GCLOUD_TAG} --push . + - docker buildx create --driver=docker-container --use + - docker buildx build --platform linux/amd64 --provenance=false --annotation "manifest,manifest-descriptor:com.googleapis.cloudmarketplace.product.service.name=services/official-sonarqube-data-center-edition.endpoints.sonarsource-public.cloud.goog" -f google-cloud-marketplace-k8s-app/Dockerfile --build-arg REGISTRY=${GCLOUD_REGISTRY} --build-arg TAG=${GCLOUD_TAG} --tag ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/deployer:${CURRENT_MINOR_VERSION} --tag ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/deployer:${GCLOUD_TAG} --push . build_gcp_staging_app_task: <<: *BUILD_GCP_APP_TEMPLATE @@ -65,5 +65,5 @@ release_gcp_prod_app_task: env: GCLOUD_REGISTRY: gcr.io/sonarsource-public GCLOUD_PRODUCT_NAME: official-sonarqube-data-center-edition - # depends_on: - # - verify_gcp_staging_app + depends_on: + - verify_gcp_staging_app