Refine the run script for Silverpeas 6.1.

Add the look Aurora by default in the dockerized Silverpeas.
Generate Dockerfile for Silverpeas 6.1
Fix for 6.1 the misname of a migration SQL script

Author: silveruser

Dockerfile

@@ -12,6 +12,7 @@ ENV TERM=xterm
 # the dependencies required to run SWFTools and PDF2JSON
 RUN apt-get update && apt-get install -y \
     wget \
+    vim \
     locales \
     procps \
     net-tools \
@@ -79,9 +80,9 @@ ENV JAVA_HOME /docker-java-home
 ENV SILVERPEAS_HOME /opt/silverpeas
 ENV JBOSS_HOME /opt/wildfly
 
-ENV SILVERPEAS_VERSION=6.1-build200607
+ENV SILVERPEAS_VERSION=6.1
 ENV WILDFLY_VERSION=18.0.1
-LABEL name="Silverpeas 6" description="Image to install and to run Silverpeas 6" vendor="Silverpeas" version="6.1-build200607" build=1
+LABEL name="Silverpeas 6" description="Image to install and to run Silverpeas 6" vendor="Silverpeas" version="6.1" build=2
 
 # Fetch both Silverpeas and Wildfly and unpack them into /opt
 RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-wildfly${WILDFLY_VERSION%.?.?}.zip \
@@ -100,15 +101,20 @@ RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-w
 # the Silverpeas Nexus Repository
 COPY src/settings.xml /root/.m2/
 
+# Copy the customized Silverpeas installation settings
+COPY src/silverpeas.gradle ${SILVERPEAS_HOME}/bin/
+
 # 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 src/run.sh /opt/
 COPY src/converter.groovy ${SILVERPEAS_HOME}/configuration/silverpeas/
 
-# Assemble Silverpeas
-RUN ./silverpeas assemble \
+# Assemble Silverpeas. Rename the script to match what is is expected by the migration descriptor
+RUN sed -i -e "s/SILVERPEAS_VERSION/${SILVERPEAS_VERSION}/g" ${SILVERPEAS_HOME}/bin/silverpeas.gradle \
+  && ./silverpeas construct \
+  && mv ../migrations/db/h2/busCore/up040/alter-table.sql ../migrations/db/h2/busCore/up040/alter_table.sql \
   && rm ../log/build-* \
   && touch .install
 

Dockerfile.template

@@ -12,6 +12,7 @@ ENV TERM=xterm
 # the dependencies required to run SWFTools and PDF2JSON
 RUN apt-get update && apt-get install -y \
     wget \
+    vim \
     locales \
     procps \
     net-tools \
@@ -100,6 +101,9 @@ RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-w
 # the Silverpeas Nexus Repository
 COPY src/settings.xml /root/.m2/
 
+# Copy the customized Silverpeas installation settings
+COPY src/silverpeas.gradle ${SILVERPEAS_HOME}/bin/
+
 # Set the default working directory
 WORKDIR ${SILVERPEAS_HOME}/bin
 
@@ -108,7 +112,8 @@ COPY src/run.sh /opt/
 COPY src/converter.groovy ${SILVERPEAS_HOME}/configuration/silverpeas/
 
 # Assemble Silverpeas
-RUN ./silverpeas assemble \
+RUN sed -i -e "s/SILVERPEAS_VERSION/${SILVERPEAS_VERSION}/g" ${SILVERPEAS_HOME}/bin/silverpeas.gradle \
+  && ./silverpeas construct \
   && rm ../log/build-* \
   && touch .install
 

src/run.sh

@@ -47,14 +47,29 @@ if [ -f ${SILVERPEAS_HOME}/bin/.install ]; then
   pre_install
   if [ -f ${SILVERPEAS_HOME}/configuration/config.properties ]; then
     echo "First start: set up Silverpeas ..."
-    ./silverpeas install && rm ${SILVERPEAS_HOME}/bin/.install
+    set +e
+    ./silverpeas install
+    if [ $? -eq 0 ]; then
+       rm ${SILVERPEAS_HOME}/bin/.install
+    else
+      echo "Error while setting up Silverpeas"
+      echo
+      for f in ${SILVERPEAS_HOME}/log/build-*; do
+        cat $f
+      done
+      exit 1
+    fi
+    set -e
+  else
+    echo "No ${SILVERPEAS_HOME}/configuration/config.properties found!"
+    exit 1
   fi
 fi
 
 if [ -f ${SILVERPEAS_HOME}/configuration/config.properties ] && [ ! -e ${SILVERPEAS_HOME}/bin/.install ]; then
   start_silverpeas
 else
-  echo "No ${SILVERPEAS_HOME}/configuration/config.properties found! No start!"
+  echo "A failure has occurred in the setting up of Silverpeas! No start!"
   exit 1
 fi
 

src/silverpeas.gradle

@@ -0,0 +1,31 @@
+/* Silverpeas version to install */
+version = 'SILVERPEAS_VERSION'
+
+configurations {
+  all {
+    transitive = true
+    /* Only to load SNAPSHOT versions of Silverpeas */
+    resolutionStrategy {
+      cacheDynamicVersionsFor 0, 'seconds'
+      cacheChangingModulesFor 0, 'seconds'
+    }
+  }
+  silverpeas {
+    /* a Silverpeas module is made up of a war and optionally a configuration archive */
+    description = 'Silverpeas Modules'
+  }
+  library {
+    description = 'Specific Silverpeas or tiers libraries to include into Silverpeas (jar only)'
+  }
+}
+
+/* Dependencies to fetch for making Silverpeas */
+dependencies {
+  silverpeas "org.silverpeas:silverpeas-assembly:${project.version}"
+  silverpeas "org.silverpeas.looks.aurora:silverpeas-aurora-configuration:${project.version}"
+  silverpeas "org.silverpeas.looks.aurora:silverpeas-aurora-war:${project.version}@war"
+  library fileTree(dir: 'lib', include: ['*.jar'])
+}
+
+/* Log level for the Silverpeas installation */
+project.ext.logLevel = org.gradle.api.logging.LogLevel.INFO