[james-project] 29/30: Add a build argument for Spring Dockerfile version

[bt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 367865246f455bb5fc33670f5f084cc93b604522
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Nov 4 10:54:14 2019 +0700

    Add a build argument for Spring Dockerfile version
    
    Upon a release we need to change simultaneously maven version and the one
    within Spring dockerfile (which relies on hard-coded version positionned
    by the assembly plugin). This results in broken build post-release as well
    as difficulties into building a specific tag when forgotten.
    
    With this changeset we can specify a build argument upon Spring docker
    image creation from CI environment, in order to use the right version
    without needing code changes. As version can be detected from build files,
    this means that we will avoid that pitfall.
---
 dockerfiles/run/spring/Dockerfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dockerfiles/run/spring/Dockerfile b/dockerfiles/run/spring/Dockerfile
index c964c2d..db224ac 100644
--- a/dockerfiles/run/spring/Dockerfile
+++ b/dockerfiles/run/spring/Dockerfile
@@ -17,8 +17,10 @@ EXPOSE 25 110 143 465 587 993 4000
 
 WORKDIR /root
 
+ARG VERSION=3.5.0-SNAPSHOT
+
 # Get data we need to run James : build results and configuration
-ADD destination/james-server-app-3.5.0-SNAPSHOT-app.zip /root/james-server-app-3.5.0-SNAPSHOT-app.zip
+ADD "destination/james-server-app-$VERSION-app.zip" "/root/james-server-app-$VERSION-app.zip"
 ADD destination/conf /root/conf
 ADD destination/glowroot/plugins /root/glowroot/plugins
 ADD destination/glowroot/glowroot.jar /root/glowroot/glowroot.jar
@@ -32,16 +34,16 @@ VOLUME /root/conf
 VOLUME /root/glowroot/plugins
 
 # Unzip build result
-RUN unzip james-server-app-3.5.0-SNAPSHOT-app.zip
+RUN unzip "james-server-app-$VERSION-app.zip"
 
 # Copy configuration.
 # Warning : we want to use the wrapper.conf file we just compiled.
-RUN cp james-server-app-3.5.0-SNAPSHOT/conf/wrapper.conf .
-RUN rm -r james-server-app-3.5.0-SNAPSHOT/conf/*
-RUN cp -r conf/* james-server-app-3.5.0-SNAPSHOT/conf
-RUN cp wrapper.conf james-server-app-3.5.0-SNAPSHOT/conf
+RUN cp "james-server-app-$VERSION/conf/wrapper.conf" .
+RUN rm -r "james-server-app-$VERSION/conf" && mkdir "james-server-app-$VERSION/conf"
+RUN cp -r conf/* "james-server-app-$VERSION/conf"
+RUN cp wrapper.conf "james-server-app-$VERSION/conf"
 
 ENV PATH "$PATH:/root/glowroot/lib"
 
-WORKDIR /root/james-server-app-3.5.0-SNAPSHOT/bin
+WORKDIR "/root/james-server-app-$VERSION/bin"
 ENTRYPOINT /root/run_james.sh
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org