Update the Dockerfile and the script to build an image from it

Author: mmoqui

Dockerfile

@@ -26,6 +26,8 @@ ARG JAVA_VERSION=11
 ARG USER_ID=1000
 ARG GROUP_ID=1000
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 COPY src/maven-deps.zip /tmp/
 
 RUN apt-get update && apt-get install -y \
@@ -66,7 +68,7 @@ RUN apt-get update && apt-get install -y \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn \
   && unzip /tmp/maven-deps.zip -d /home/silveruser/ \
-  && chown -R silveruser:users /home/silveruser/.m2 \
+  && chown -R silveruser:silveruser /home/silveruser/.m2 \
   && curl -fsSL -o /tmp/swftools-bin-0.9.2.zip https://www.silverpeas.org/files/swftools-bin-0.9.2.zip \
   && echo 'd40bd091c84bde2872f2733a3c767b3a686c8e8477a3af3a96ef347cf05c5e43 *swftools-bin-0.9.2.zip' | sha256sum - \
   && unzip /tmp/swftools-bin-0.9.2.zip -d / \
@@ -87,6 +89,9 @@ RUN apt-get update && apt-get install -y \
 COPY src/inputrc /home/silveruser/.inputrc
 COPY src/settings.xml /home/silveruser/.m2/
 
+RUN chown silveruser:silveruser /home/silveruser/.inputrc \
+  && chown silveruser:silveruser /home/silveruser/.m2/settings.xml
+
 ENV LANG ${DEFAULT_LOCALE}
 ENV LANGUAGE ${DEFAULT_LOCALE}
 ENV LC_ALL ${DEFAULT_LOCALE}

README.md

@@ -13,27 +13,26 @@ To create an image, just do:
 
 	$ ./build.sh
 
-this will build an image to work on the latest version of Silverpeas as defined in the `Dockerfile` 
-with the tag `silverpeas/silverdev:latest`.
+this will build an image to work on the latest version of Silverpeas and with the latest supported
+version of Wildfly as defined in the `Dockerfile` with the tag `silverpeas/silverdev:latest`.
 
-Otherwise, to create an image to build a given version of Silverpeas 6, you have to specify as argument 
-both the version of Silverpeas followed by the exact version of Wildfly used by this version:
+To specify both a given version of Wildfly (for instance Wildfly 10.1.0) to use and the version of 
+the image to set, just do:
 
-	$ ./build.sh -v 6.0 10.1.0
+	$ ./build.sh -w 10.1.0 -v 6.0
 
-This will build a Docker image with the tag `silverpeas/silverdev:6.0`. It is to work on a 
-Silverpeas 6.0 project and with Wildfly 10.1.0. Here, the version of Silverpeas passed as argument 
-isn't in fact important; it just a convention stipulating that a tag of an image is the version
-of the Silverpeas projects for which it was created. By doing so, it will be easy for the developer
-to switch between different containers, each of them prepared for a different version of Silverpeas.
-But the version of Wildfly passed as argument is important because a Wildfly distribution preconfigured 
-for the integration tests will be downloaded and in general, for each version of Silverpeas 
+This will build a Docker image with the tag `silverpeas/silverdev:6.0`. By convention, the version of
+the Docker image should be the same of the version of Silverpeas for which the image is dedicated. It
+is mainly for information so what, by doing so, it will be easy for the developer to switch between
+different containers, each of them prepared for a different version of Silverpeas.
+Nevertheless, the version of Wildfly passed as argument is important because a Wildfly distribution 
+preconfigured for the integration tests will be downloaded and in general, for each version of Silverpeas 
 (stable or in-development version) matches a given version of Wildfly.
 
 The image is created to start a container with a default user (`silveruser`). 1000 is his identifier
 and `users` (group identifier 100) is its main group.
 In order to avoid permissions problems with the source code that is shared between the host and the
-container, it is required that the identifier of your account in your host is the same that the 
+container(s), it is required that the identifier of your account in your host is the same that the 
 identifier of the default user in the container. In the case your user identifier isn't 1000, then you have to
 create an image by specifying the identifier in the command line as following (here, in our example,
 the user identifier is 1026):

build.sh

@@ -14,7 +14,7 @@ while [[ $# -gt 0 ]]; do
   key="$1"
   case $key in
     -h)
-      echo "Usage: build.sh [-u USER_ID] [-g GROUP_ID] -v [SILVERPEAS_VERSION WILDFLY_VERSION]"
+      echo "Usage: build.sh [-u USER_ID] [-g GROUP_ID] [-w WILDFLY_VERSION] [-v IMAGE_VERSION]"
       echo "Build a Docker image from which a Docker container could be spawned to code and build"
       echo "within a compartmentalized environment some Silverpeas projects that can be shared "
       echo "between the container and the host."
@@ -25,10 +25,12 @@ while [[ $# -gt 0 ]]; do
       echo "   -g GROUP_ID set the group identifier as GROUP_ID (it is recommended the GROUP_ID is"
       echo "               your own group identifier in the host if the code source is shared"
       echo "               between a Docker container and the host. By default 1000."
-      echo "   -v SILVERPEAS_VERSION WILDFLY_VERSION"
-      echo "               set both the version of Silverpeas and of the Widfly distribution for"
-      echo "               which a docker container will be spawn to work on theses versions."
-      echo "               By default, the latest version in development of Silverpeas"
+      echo "   -w WILDFLY_VERSION"
+      echo "               set the version of the Widfly distribution  to use in the integration"
+      echo "               tests. By default, the latest supported version of Wildfly."
+      echo "   -v IMAGE_VERSION"
+      echo "               the version of the Docker image to build. Should be equal to the"
+      echo "               version of Silverpeas for which the Docker image is."
       exit 0
       ;;
     -u)
@@ -41,15 +43,18 @@ while [[ $# -gt 0 ]]; do
       shift # past argument
       shift # past value
       ;;
+    -w)
+      checkNotEmpty "$2"
+      wildfly_version="--build-arg WILDFLY_VERSION=$2"
+      shift # past argument
+      shift # past first value
+      ;;
     -v)
+      checkNotEmpty "$2"
       silverpeas_version="$2"
-      wildfly_version="$3"
-      checkNotEmpty ${silverpeas_version}
-      checkNotEmpty ${wildfly_version}
       version=1
       shift # past argument
       shift # past first value
-      shift # past second value
       ;;
     *)
       die "Unknown option: $1"
@@ -60,12 +65,11 @@ done
 
 # build the Docker image for building some of the Silverpeas projects
 if [[ ${version} -eq 1 ]]; then
-  docker build ${user} ${group} \
-    --build-arg WILDFLY_VERSION=${wildfly_version} \
+  docker build ${user} ${group} ${wildfly_version} \
     -t silverpeas/silverdev:${silverpeas_version} \
     .
 else
-  docker build ${user} ${group} \
+  docker build ${user} ${group} ${wildfly_version} \
     -t silverpeas/silverdev:latest \
     .
 fi

run.sh

@@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]; do
       echo ""
       echo "with:"
       echo "   -i IMAGE_VERSION  the version of the Docker image to instantiate. By default latest."
-      echo "   -g WORKING_DIR    the path of your working directory to mount The working directory"
+      echo "   -w WORKING_DIR    the path of your working directory to mount The working directory"
       echo "                     will be mounted to /home/silveruser/projects. By default nothing to"
       echo "                     mount."
       echo "   -n NAME           a name to give to the container. By default silverdev-IMAGE_VERSION."
@@ -63,4 +63,4 @@ docker run -it ${working_dir} -v "${settings}":/home/silveruser/.m2/settings.xml
   -v "$HOME"/.ssh:/home/silveruser/.ssh \
   -v "$HOME"/.gnupg:/home/silveruser/.gnupg \
   --name ${name} \
-  silverpeas/silverdev:${image_version} /bin/bash
+  silverpeas/silverdev:${image_version} /bin/bash