Prepare Dockerfile for snapshot version 6.0-alpha1

Author: mmoqui

Dockerfile

@@ -2,7 +2,7 @@ FROM debian:jessie-backports
 
 MAINTAINER Miguel Moquillon "miguel.moquillon@silverpeas.org"
 
-ARG SILVERPEAS_VERSION=6.0-SNAPSHOT
+ARG SILVERPEAS_VERSION=6.0-alpha1
 ARG WILDFLY_VERSION=10.0.0
 ARG DEFAULT_LOCALE=en_US.UTF-8
 
@@ -105,14 +105,14 @@ RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-w
 
 # Copy the Maven settings.xml required to install Silverpeas by fetching the software bundles from 
 # the Silverpeas Nexus Repository
-COPY settings.xml ${HOME}/.m2/
+COPY src/settings.xml ${HOME}/.m2/
 
 # Set the default working directory
 WORKDIR ${SILVERPEAS_HOME}/bin
 
 # Copy this container init script that will be run each time the container is ran
-COPY run.sh /opt/
-COPY ooserver /opt/
+COPY src/run.sh /opt/
+COPY src/ooserver /opt/
 
 # Assemble the Silverpeas application with its working directories and marks it as ready to complete
 # the installation of Silverpeas in Wildfly at first run

README.md

@@ -51,7 +51,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
   -v /var/log/silverpeas:/opt/silverpeas/log \
   -v /var/lib/silverpeas:/opt/silverpeas/data \
   --link postgresql:database \
-  silverpeas:6.0
+  silverpeas/silverpeas:6.0
 ```
 This image exposes the 8000 port at which Silverpeas listens and this port of the container is here mapped to the 8080 port of the host.
 It is recommended to mount the volumes `/opt/silverpeas/log` and `/opt/silverpeas/data` from the container. Indeed, the first volume contains the log files produced by the Silverpeas application whereas the second volume contains all the data that are managed by the users in Silverpeas. So, you can easily have a glance at the Silverpeas activity and you can switch to the next version of Silverpeas without losing any data. (Using a [Data Volume Container][data-volume] to map `/opt/silverpeas/log` and `/opt/silverpeas/data` is a better solution.)
@@ -63,7 +63,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
   -v /var/log/silverpeas:/opt/silverpeas/log \
   -v /var/lib/silverpeas:/opt/silverpeas/data \
   --link postgresql:database \
-  silverpeas:6.0
+  silverpeas/silverpeas:6.0
 ```
 where `/etc/silverpeas/config.properties` is the Silverpeas global configuration file on the host.
 
@@ -91,7 +91,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
   -v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/config.properties \
   -v /var/log/silverpeas:/opt/silverpeas/log \
   -v /var/lib/silverpeas:/opt/silverpeas/data \
-  silverpeas:6.0
+  silverpeas/silverpeas:6.0
 ```
 where `database` is the hostname on which run PostgreSQL and that is referred as such in the `config.properties`.
 
@@ -111,7 +111,7 @@ $ docker create --name silverpeas-store \
   -v /opt/silverpeas/log \
   -v /opt/silverpeas/properties \
   -v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/properties \
-  silverpeas:6.0 \
+  silverpeas/silverpeas:6.0 \
   /bin/true
 ```
 
@@ -120,7 +120,7 @@ Then to mount the volumes in the Silverpeas container:
 $ docker run --name silverpeas -p 8080:8000 -d \
   --link postgresql:database \
   --volumes-from silverpeas-store \
-  silverpeas:6.0
+  silverpeas/silverpeas:6.0
 ``` 
 
 If you have to customize the settings of Silverpeas or add, for example, a new database definition in Wildfly, then specify these settings with the Data Volume Container:
@@ -132,7 +132,7 @@ $ docker create --name silverpeas-store \
   -v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/properties \
   -v /etc/silverpeas/CustomerSettings.xml:/opt/silverpeas/configuration/silverpeas/CustomerSettings.xml \
   -v /etc/silverpeas/my-datasource.cli:/opt/silverpeas/configuration/jboss/my-datasource.cli \
-  silverpeas:6.0 \
+  silverpeas/silverpeas:6.0 \
   /bin/true
 ```
 

build.sh

@@ -7,10 +7,10 @@ if [ $# -eq 2 ]; then
   docker build \
     --build-arg SILVERPEAS_VERSION=$silverpeas_version \
     --build-arg WILDFLY_VERSION=$wildfly_version \
-    -t silverpeas:$silverpeas_version \
+    -t silverpeas/silverpeas:$silverpeas_version \
     .
 else
   docker build \
-    -t silverpeas:latest \
+    -t silverpeas/silverpeas:latest \
     .
 fi