From c0ccf124a5c54ca78489a477a3c01d8463e58796 Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Wed, 13 Dec 2017 15:48:26 -0500 Subject: Fix the hard coded snapshot path to using maven project version Issue-ID: AAI-546 Change-Id: Ib8661840d6ea6640293438f65bc1b81cfab30b92 Signed-off-by: Venkata Harish K Kajur --- src/main/docker/Dockerfile | 4 ++-- version.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 1ab49ff..b49f1bb 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ RUN export JAVA_HOME # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME -copy swm/package/nix/dist_files/appl/sparky-be/1.1.0-SNAPSHOT/ $MICRO_HOME/ +copy swm/package/nix/dist_files/appl/sparky-be/${project.version}/ $MICRO_HOME/ RUN ls -la $MICRO_HOME/ RUN mkdir -p $BIN_HOME COPY *.sh $BIN_HOME/ @@ -26,4 +26,4 @@ EXPOSE 8000 8000 CMD tail -F -n0 /etc/hosts CMD /opt/app/sparky/bin/start.sh -#CMD top \ No newline at end of file +#CMD top diff --git a/version.properties b/version.properties index 325432a..55fbf44 100644 --- a/version.properties +++ b/version.properties @@ -4,10 +4,10 @@ major=1 minor=1 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg