Merge tag 'release/0.7.6' into develop

[maven-release-plugin] copy for tag release/0.7.6
AbsaOSS · Mar 30, 2022 · 888968c · 888968c
2 parents d6c56e4 + a275929
commit 888968c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/admin/Dockerfile b/admin/Dockerfile
@@ -32,8 +32,16 @@ LABEL \
     license="Apache License, version 2.0" \
     name="Spline Admin Tool"
 
+# Install Tini
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+            tini=0.18* \
+ && rm -rf /var/lib/apt/lists/*
+
+USER 1001
+
 COPY target/$PROJECT_BUILD_FINAL_NAME.jar ./admin.jar
 COPY entrypoint.sh .
 
-ENTRYPOINT ["sh", "./entrypoint.sh"]
+ENTRYPOINT ["tini", "-g", "--", "sh", "./entrypoint.sh"]
 CMD ["--help"]
diff --git a/kafka-gateway/Dockerfile b/kafka-gateway/Dockerfile
@@ -28,4 +28,7 @@ EXPOSE 8080
 EXPOSE 8009
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY target/*.war /usr/local/tomcat/webapps/ROOT.war
+
+USER 1001
+ARG PROJECT_BUILD_FINAL_NAME
+COPY --chown=1001 target/$PROJECT_BUILD_FINAL_NAME/ /usr/local/tomcat/webapps/ROOT/
diff --git a/persistence/src/main/scala/za/co/absa/spline/persistence/ArangoDatabaseFacade.scala b/persistence/src/main/scala/za/co/absa/spline/persistence/ArangoDatabaseFacade.scala
@@ -50,6 +50,7 @@ class ArangoDatabaseFacade(connectionURL: ArangoConnectionURL, maybeSSLContext:
         .having(maybeSSLContext)(_ sslContext _)
     }
 
+    // enable active failover
     arangoBuilder.acquireHostList(activeFailover)
 
     for ((host, port) <- hostsWithPorts) arangoBuilder.host(host, port)

diff --git a/rest-gateway/Dockerfile b/rest-gateway/Dockerfile
@@ -28,4 +28,7 @@ EXPOSE 8080
 EXPOSE 8009
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY target/*.war /usr/local/tomcat/webapps/ROOT.war
+
+USER 1001
+ARG PROJECT_BUILD_FINAL_NAME
+COPY --chown=1001 target/$PROJECT_BUILD_FINAL_NAME/ /usr/local/tomcat/webapps/ROOT/