Merge branch 'develop' into DATALAB-new-jars-sufix-in-dockerfiles
diff --git a/services/billing-aws/Dockerfile b/services/billing-aws/Dockerfile
index ed8e55e..b327889 100644
--- a/services/billing-aws/Dockerfile
+++ b/services/billing-aws/Dockerfile
@@ -23,6 +23,6 @@
USER root
-COPY billing-aws-2.4.jar /root/
+COPY billing-aws-*.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-aws-2.4.jar --conf /root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-aws-*.jar --conf /root/billing.yml
\ No newline at end of file
diff --git a/services/billing-azure/Dockerfile b/services/billing-azure/Dockerfile
index 975b251..1986e98 100644
--- a/services/billing-azure/Dockerfile
+++ b/services/billing-azure/Dockerfile
@@ -23,6 +23,6 @@
USER root
-COPY billing-azure-2.4.jar /root/
+COPY billing-azure-*.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-azure-2.4.jar --conf /root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-azure-*.jar --conf /root/billing.yml
\ No newline at end of file
diff --git a/services/billing-gcp/Dockerfile b/services/billing-gcp/Dockerfile
index 97e93c8..74c1b0e 100644
--- a/services/billing-gcp/Dockerfile
+++ b/services/billing-gcp/Dockerfile
@@ -23,6 +23,6 @@
USER root
-COPY billing-gcp-2.4.jar /root/
+COPY billing-gcp-*.jar /root/
-CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-gcp-2.4.jar --spring.config.location=/root/billing.yml
\ No newline at end of file
+CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-gcp-*.jar --spring.config.location=/root/billing.yml
\ No newline at end of file
diff --git a/services/self-service/Dockerfile b/services/self-service/Dockerfile
index 6275ba0..354affa 100644
--- a/services/self-service/Dockerfile
+++ b/services/self-service/Dockerfile
@@ -34,7 +34,7 @@
&& apk --purge -v del py-pip \
&& rm -rf /var/cache/apk/*
-COPY self-service-2.4.jar /root/
+COPY self-service-*.jar /root/
COPY entrypoint.sh /
RUN chmod 755 /entrypoint.sh
