From fcaa28120e14eca668556e728893897c3a5a5b6d Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Fri, 26 Jul 2024 12:58:57 -0700 Subject: [PATCH] single platform --- buildspec.yml | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index 624dd67..c5b02c5 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -24,59 +24,61 @@ phases: - aws ecr create-repository --repository-name mrt-opendj || echo 'ignore if exists...' - aws ecr create-repository --repository-name mrt-init || echo 'ignore if exists...' - aws ecr create-repository --repository-name mrt-database || echo 'ignore if exists...' + - BUILDCMD="buildx build --platform linux/arm64,linux/amd64 --push" + - BUILDCMD="build --push" build: on-failure: ABORT commands: - docker buildx create --use - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/merritt-maven:dev \ --build-arg JAVA_RELEASE_ARG=${JAVA_RELEASE:-8} \ - --push mrt-inttest-services/merritt-maven + mrt-inttest-services/merritt-maven - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/merritt-tomcat:dev \ - --push mrt-inttest-services/merritt-tomcat + mrt-inttest-services/merritt-tomcat - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mock-merritt-it:dev \ - --push mrt-inttest-services/mock-merritt-it + mrt-inttest-services/mock-merritt-it - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-it-database:dev \ - --push mrt-inttest-services/mrt-it-database + mrt-inttest-services/mrt-it-database - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-it-database-audit-replic:dev \ --build-arg LOAD_SQL=/tmp/audit_replic_data.sql \ - --push mrt-inttest-services/mrt-it-database + mrt-inttest-services/mrt-it-database - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-minio-it:dev \ - --push mrt-inttest-services/mrt-minio-it + mrt-inttest-services/mrt-minio-it - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-minio-it-with-content:dev \ --build-arg ECR_REGISTRY=${ECR_REGISTRY} \ - --push mrt-inttest-services/mrt-minio-it-with-content + mrt-inttest-services/mrt-minio-it-with-content - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-database \ - --push mrt-services/mysql + mrt-services/mysql - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-opendj \ - --push mrt-services/ldap + mrt-services/ldap - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/mrt-init \ - --push mrt-services/merritt-init + mrt-services/merritt-init - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/callback \ - --push mrt-services/callback + mrt-services/callback post_build: # this build may fail due to rate limits @@ -84,6 +86,6 @@ phases: commands: - docker buildx create --use - | - docker buildx build --quiet --platform linux/arm64,linux/amd64 \ + docker ${BUILDCMD} \ -t ${ECR_REGISTRY}/fakesmtp:dev \ --push mrt-inttest-services/fakesmtp