Merge pull request #10 from dartartem/master

#9: Eliminate wildcard Dockerfile needs to COPY build/libs/eventuate-…
eventuate-tram · Mar 30, 2021 · 710fbd0 · 710fbd0
2 parents d2102bf + 1063837
commit 710fbd0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/docker-compose-mysql-binlog.yml b/docker-compose-mysql-binlog.yml
@@ -31,7 +31,10 @@ services:
       - MYSQL_PASSWORD=mysqlpw
 
   proxy:
-    build: ./eventuate-tram-messaging-proxy-service
+    build:
+      context: ./eventuate-tram-messaging-proxy-service/
+      args:
+        proxyServiceVersion: ${PROXY_SERVICE_VERSION}
     image: eventuateio/eventuate-tram-http-proxy-service:$DOCKER_IMAGE_TAG
     ports:
       - "8098:8080"
@@ -49,7 +52,10 @@ services:
       EVENTUATE_LOCAL_KAFKA_CONSUMER_PROPERTIES_SESSION_TIMEOUT_MS: 6000
 
   proxy-follower:
-    build: ./eventuate-tram-messaging-proxy-service
+    build:
+      context: ./eventuate-tram-messaging-proxy-service/
+      args:
+        proxyServiceVersion: ${PROXY_SERVICE_VERSION}
     ports:
       - "8097:8080"
     depends_on:

diff --git a/eventuate-tram-messaging-proxy-service/Dockerfile b/eventuate-tram-messaging-proxy-service/Dockerfile
@@ -1,5 +1,6 @@
 FROM openjdk:8u171-jre-alpine
 RUN apk --no-cache add curl
 HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1
-CMD java ${JAVA_OPTS} -jar eventuate-tram-messaging-proxy-service-*.jar
-COPY build/libs/eventuate-tram-messaging-proxy-service-*.jar .
+CMD java ${JAVA_OPTS} -jar proxy.jar
+ARG proxyServiceVersion
+COPY build/libs/eventuate-tram-messaging-proxy-service-${proxyServiceVersion}.jar ./proxy.jar