buildspec

CDLUC3 · Jul 25, 2024 · bbd9a95 · bbd9a95
1 parent 3f86e7c
commit bbd9a95
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/buildspec.yml b/buildspec.yml
@@ -25,23 +25,19 @@ phases:
       - aws ecr create-repository --repository-name mrt-init || echo 'ignore if exists...'
       - aws ecr create-repository --repository-name mrt-database || echo 'ignore if exists...'
 
+  build:
+    on-failure: ABORT
+    commands:
       - docker buildx create --use 
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/merritt-maven:dev \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --build-arg JAVA_RELEASE_ARG=${JAVA_RELEASE:-8} \
           --push mrt-inttest-services/merritt-maven
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/merritt-tomcat:dev \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-inttest-services/merritt-tomcat
-
-  build:
-    on-failure: ABORT
-    commands:
-      - docker buildx create --use 
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mock-merritt-it:dev \
@@ -58,39 +54,30 @@ phases:
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-minio-it:dev \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-inttest-services/mrt-minio-it
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-minio-it-with-content:dev \
           --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-inttest-services/mrt-minio-it-with-content
 
-  post_build:
-    on-failure: ABORT
-    commands:
-      - docker buildx create --use 
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/fakesmtp:dev \
           --push mrt-inttest-services/fakesmtp
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-database \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-services/mysql
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-opendj \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-services/ldap
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-init \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-services/merritt-init
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/callback \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-services/callback