add mrt-zk to build

CDLUC3 · Apr 9, 2024 · 9099b17 · 9099b17
1 parent 383e29b
commit 9099b17
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 300 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -46,3 +46,7 @@
 	path = mrt-integ-tests
 	url = [email protected]:cdluc3/mrt-integ-tests.git
 	branch = main
+[submodule "mrt-zk"]
+	path = mrt-services/dep_zk/mrt-zk
+	url = [email protected]:cdluc3/mrt-zk
+	branch = main
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Log into one of our uc3-mrt-docker-dev hosts.  Run the following commands as nor
    merritt-docker> source bin/docker_environment.sh
    ```
 
-1. Build dependencies:
+1. Build dependencies: (Out of date)
    ```
    cd merritt-docker
    bin/dep_build.sh
@@ -396,7 +396,7 @@ sudo echo '127.0.0.1	my-minio-localhost-alias' >> /etc/hosts
 
 Dev Server
 ```
-./bin/dep_build.sh
+./bin/dep_build.sh (Out of date)
 ```
 
 Local Desktop

diff --git a/bin/dep_build.sh b/bin/dep_build.sh
diff --git a/bin/fresh_build.sh b/bin/fresh_build.sh
@@ -238,6 +238,7 @@ git_repo_submodules() {
 
   checkout_build_config 'mrt-services/dep_core/mrt-core2' 'mrt-core'
   checkout_build_config 'mrt-services/dep_cloud/mrt-cloud' 'mrt-cloud'
+  checkout_build_config 'mrt-services/dep_zk/mrt-zk' 'mrt-zk'
   checkout_build_config 'mrt-services/dep_cdlzk/cdl-zk-queue' 'cdl-zk-queue'
   checkout_build_config 'mrt-services/dep_zoo/mrt-zoo' 'mrt-zoo'
 
@@ -381,6 +382,7 @@ build_microservice_images() {
   cd $WKDIR/mrt-services
 
   build_image_push ${ECR_REGISTRY}/mrt-core2:dev dep_core
+  build_image_push ${ECR_REGISTRY}/mrt-zk:dev dep_zk
   build_image_push ${ECR_REGISTRY}/cdl-zk-queue:dev dep_cdlzk
   build_image_push ${ECR_REGISTRY}/mrt-zoo:dev dep_zoo
   build_image_push ${ECR_REGISTRY}/mrt-cloud:dev dep_cloud

diff --git a/bin/it_build.sh b/bin/it_build.sh
diff --git a/bin/local_dep_build.sh b/bin/local_dep_build.sh
diff --git a/bin/local_it_build.sh b/bin/local_it_build.sh
diff --git a/build-config.yml b/build-config.yml
@@ -113,6 +113,7 @@ build-config:
       mrt-core: main
       mrt-cloud: main
       cdl-zk-queue: main
+      mrt-zk: main
       mrt-zoo: main
       mrt-inventory: main
       mrt-store: main
@@ -157,35 +158,4 @@ build-config:
     <<: *jenkins
     tags:
       <<: *maintags
-  fix15-jenkins:
-    <<: *jenkins
-    tags:
-      mrt-core: fix1.5
-      mrt-cloud: status
-      cdl-zk-queue: main
-      mrt-zoo: main
-      mrt-inventory: fix1.5
-      mrt-store: fix1.5
-      mrt-ingest: fix1.5
-      mrt-audit: fix1.5
-      mrt-replic: fix1.5
-      mrt-dashboard: main
-      mrt-integ-tests: main
-  java11-main:
-    <<: *main
-    tags: &java11tags
-      mrt-core: java11
-      mrt-cloud: java11
-      cdl-zk-queue: java11
-      mrt-zoo: java11
-      mrt-inventory: java11
-      mrt-store: java11
-      mrt-ingest: java11
-      mrt-audit: java11
-      mrt-replic: java11
-      mrt-dashboard: main
-      mrt-integ-tests: main
-  java11-jenkins:
-    <<: *jenkins
-    tags: 
-      <<: *java11tags
+
diff --git a/mrt-services/dep_cdlzk/Dockerfile b/mrt-services/dep_cdlzk/Dockerfile
@@ -9,7 +9,7 @@
 
 ARG ECR_REGISTRY=ecr_registry_not_set
 
-FROM ${ECR_REGISTRY}/mrt-core2:dev
+FROM ${ECR_REGISTRY}/mrt-zk:dev
 
 WORKDIR /build/cdl-zk-queue
 

diff --git a/mrt-services/dep_zk/.dockerignore b/mrt-services/dep_zk/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+**/target
+README.md
diff --git a/mrt-services/dep_zk/Dockerfile b/mrt-services/dep_zk/Dockerfile
@@ -0,0 +1,28 @@
+#*********************************************************************
+#   Copyright 2021 Regents of the University of California
+#   All rights reserved
+#*********************************************************************
+
+# docker build --build-arg ECR_REGISTRY=${ECR_REGISTRY} -t ${ECR_REGISTRY}/mrt-zk:dev .
+# aws ecr create-repository --repository-name mrt-zk
+# docker push ${ECR_REGISTRY}/mrt-zk:dev
+
+ARG ECR_REGISTRY=ecr_registry_not_set
+
+FROM ${ECR_REGISTRY}/mrt-core2:dev
+
+WORKDIR /build/mrt-zk
+
+# Now add the java code
+ADD mrt-zk ./
+
+# Build and clean in one step to keep the image size small
+RUN mkdir appdir && \
+    mvn -ntp install -DskipTests -Ddocker.skip && \
+    date -r target +'dep-cdlzk: %Y-%m-%d:%H:%M:%S' >> /build/static/build.content.txt && \
+    cp target/*.jar appdir && \
+    mvn clean && \
+    rm -rf /root/.m2/repository/org/codehaus && \
+    rm -rf /root/.m2/repository/org/apache/maven
+
+ENTRYPOINT [ "ls", "appdir" ]