Replace the H2 by PostgreSQL as database for Silverpeas.

Replace the initial Silverpeas dataset by the one produced by Aurore.

Author: mmoqui

Dockerfile

@@ -1,8 +1,7 @@
-FROM ubuntu:focal
-
-MAINTAINER Miguel Moquillon "miguel.moquillon@silverpeas.org"
+FROM ubuntu:jammy
 
 ENV TERM=xterm
+ENV DEBIAN_FRONTEND=noninteractive
 
 #
 # Install required and recommended programs for Silverpeas
@@ -11,7 +10,7 @@ ENV TERM=xterm
 # Installation of LibreOffice, ImageMagick, Ghostscript, and then
 # the dependencies required to run SWFTools and PDF2JSON
 RUN apt-get update \
-  && apt-get install -y tzdata \ 
+  && apt-get install -y tzdata \
   && apt-get install -y \
     apt-utils \
     iputils-ping \
@@ -32,6 +31,8 @@ RUN apt-get update \
     libreoffice \
     ure \
     gpgv \
+    postgresql \
+    sudo \
   && rm -rf /var/lib/apt/lists/* \
   && update-ca-certificates -f
 
@@ -74,9 +75,21 @@ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 ENV SILVERPEAS_HOME /opt/silverpeas
 ENV JBOSS_HOME /opt/wildfly
 
-ARG SILVERPEAS_VERSION=6.4
+ARG SILVERPEAS_VERSION=6.4.2-SNAPSHOT
 ARG WILDFLY_VERSION=26.1.3
-LABEL name="Silverpeas Test" description="An all-to-one image to run Silverpeas for demo/testing purpose" vendor="Silverpeas" version=${SILVERPEAS_VERSION} build=1
+
+LABEL org.opencontainers.image.vendor="Silverpeas" \
+      org.opencontainers.image.authors="Miguel Moquillon <miguel.moquillon@silverpeas.org>" \
+      org.opencontainers.image.licenses="AGPLv3" \
+      org.opencontainers.image.title="Silverpeas for testing/trial purpose" \
+      org.opencontainers.image.description="An all-to-one image to run Silverpeas for demo/testing purpose" \
+      org.opencontainers.image.version="${SILVERPEAS_VERSION}"
+
+LABEL name="Silverpeas for testing/trial purpose" \
+      description="An all-to-one image to run Silverpeas for demo/testing purpose" \
+      vendor="Silverpeas" \
+      version="${SILVERPEAS_VERSION}" \
+      build=1
 
 # 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 \
@@ -90,19 +103,13 @@ RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-w
   && unzip wildfly-${WILDFLY_VERSION}.Final.zip -d /opt \
   && mv /opt/silverpeas-${SILVERPEAS_VERSION}-wildfly${WILDFLY_VERSION%.?.?} /opt/silverpeas \
   && mv /opt/wildfly-${WILDFLY_VERSION}.Final /opt/wildfly \
-  && wget -nc https://www.silverpeas.org/files/oak-migrate.zip \
-  && echo '02d21f69004f2d9e634e82ec062d94521bd6bc0385d7c0ddf9af261cb63afdbb oak-migrate.zip' | sha256sum -c --status - \
-  && mkdir -p /opt/oak-migration \
-  && unzip oak-migrate.zip -d /opt/oak-migration/ \
-  && chmod +x /opt/oak-migration/oak-migrate.sh \
-  && rm *.zip \
-  && mkdir -p /root/.m2
+  && rm ./*.zip \
+  && mkdir -p /root/.m2/repository
 
 # Copy the Maven settings.xml required to install Silverpeas by fetching the software bundles from
 # the Silverpeas Nexus Repository
-COPY src/repository /root/.m2/repository
 COPY src/settings.xml /root/.m2/
-COPY src/h2 /opt/silverpeas/h2
+COPY src/silverpeas.sql /opt/silverpeas/
 COPY src/configuration /opt/silverpeas/configuration
 COPY src/data /opt/silverpeas/data
 COPY src/bin /opt/silverpeas/bin
@@ -128,7 +135,7 @@ EXPOSE 8000 9990
 
 # The following Silverpeas folders are exposed by default so that you can access outside the container the logs,
 # the data, and the workflow definitions that are produced in Silverpeas.
-VOLUME ["/opt/silverpeas/log", "/opt/silverpeas/data", "/opt/silverpeas/h2"]
+VOLUME ["/opt/silverpeas/log", "/opt/silverpeas/data"]
 
 # What to execute by default when running the container
 CMD ["/opt/run.sh"]

README.md

@@ -46,25 +46,30 @@ say English, by passing it to the container through the `locale` environment var
 To customize more configuration parameters in Silverpeas, please refer section 
 **Custom configuration** below.
 
+Once Silverpeas running, you can access it through the following URL 
+[http://localhost:8000/silverpeas](http://localhost:8000/silverpeas) with your preferred web 
+browser. To sign in, please use the following login identifier `SilverAdmin` with the following 
+password `SilverAdmin`. You will find then a Silverpeas collaborative platform with an initial 
+content set.
+
 ### Keep data out of the container
 
 By default, the data are stored into the container and then they can be lost once the container is
 removed. 
 To share the data with others containers or to keep them out of a container, you
-can mount the volumes `/opt/silverpeas/data` and `/opt/silverpeas/h2` on the host.
+can mount the volumes `/opt/silverpeas/data` and `/var/lib/postgresql/data` on the host.
 You can also mount the volume `/opt/silverpeas/log` in order to glance at the logs.
 For example:
 
 	$ docker run --name silverpeas-test -p 8080:8000 -d \
 	  -v silverpeas-log:/opt/silverpeas/log \
 	  -v silverpeas-data:/opt/silverpeas/data \
-	  -v silverpeas-h2:/opt/silverpeas/h2 \
+	  -v silverpeas-postgresql:/var/lib/postgresql/data \
 	  silverpeas/silverpeas-test
 
-The logs, the Silverpeas data and the H2 database's data are here all mounted on the host under the 
-respective labels `silverpeas-log`, `silverpeas-data` and `silverpeas-h2`. 
-Refers the 
-[Docker Documentation](https://docs.docker.com/engine/tutorials/dockervolumes/#locating-a-volume) 
+The logs, the Silverpeas data and the PostgreSQL database's data are here all mounted on the host 
+under the respective labels `silverpeas-log`, `silverpeas-data` and `silverpeas-postgresql`. 
+Refers the [Docker Documentation](https://docs.docker.com/engine/tutorials/dockervolumes/#locating-a-volume) 
 to locate the labels of mounted volumes in a Docker installation. Be careful, because the volumes 
 have a content that was produced at the image creation, they cannot be mounted in the host's
 filesystem without losing the volumes' content (the mount point overlays the pre-existing content of
@@ -77,7 +82,7 @@ configuration file `config.properties`, set them into a `custom_config.propertie
 file on the host and then map it to a `/opt/silverpeas/configuration/custom_config.properties` file 
 in the container.
 For example, to set the SMTP properties to receive email notifications, you add them into a 
-`custom_config.properties` file (for our example, in your home `/home/me`):
+`custom_config.properties` file (for our example, in your home directory `/home/me`):
 
 	SMTP_SERVER=smtp.googlemail.com
 	SMTP_AUTHENTICATION=true
@@ -98,15 +103,19 @@ configuration file.
 
 ### Custom Silverpeas settings
 
-The Silverpeas core engines as well as the Silverpeas applications can be customized by their 
-settings in the `/opt/silverpeas/properties` directory. For historical reason, the customization of
-such settings are performed by an XML script `CustomerSettings.xml` that follows the syntax of the
-main `00-SilverpeasSettings.xml` script in `/opt/silverpeas/configuration/silverpeas` directory. If
-you wish to customize some of the Silverpeas settings, you can do it through either a 
-`CustomSettings.xml` file or a `CustomerSettings.xml` file and then map it to the same file in the
+The Silverpeas core engines as well as the Silverpeas applications can be customized by modifying 
+their settings in their properties files located in the `/opt/silverpeas/properties` directory. For 
+historical reason, the customization of such settings are performed by XML scripts  
+that follows the syntax of the main `00-SilverpeasSettings.xml` script in the 
+`/opt/silverpeas/configuration/silverpeas` directory.
+
+By default, this image is provided with a customization of some settings through the XML file 
+`CustomerSettings.xml`, in order to provide a ready-to-test Silverpeas platform. If you which to add
+additional customization of the Silverpeas settings, you can do it by adding then into your own 
+XML file and then map it to the same file in the
 `/opt/silverpeas/configuration/silverpeas/` directory in the container.
-For example, to set weaker rules for passwords, you can set them into such an XML file (located for
-example in your home `/home/me`):
+For example, to set weaker rules for passwords, you can set them into the 
+`MyOwnCustomSettings.xml`XML file (located for example in your home directory `/home/me`):
 
     <?xml version="1.0" encoding="UTF-8"?>
     <silverpeas-settings product="custom">
@@ -126,7 +135,7 @@ example in your home `/home/me`):
 then you map it to the container:
 
 	$ docker run --name silverpeas-test -p 8080:8000 -d \
-	  -v /home/me/CustomSettings.xml:/opt/silverpeas/configuration/silverpeas/CustomSettings.xml \
+	  -v /home/me/MyOwnCustomSettings.xml:/opt/silverpeas/configuration/silverpeas/MyOwnCustomSettings.xml \
 	  silverpeas/silverpeas-test
 
 ## Logs

src/bin/h2database

@@ -1,47 +1,25 @@
 #!/usr/bin/env bash
 
-migrate_jcr() {
-  # figure out the data home directory (by default it is into the Silverpeas home directory)
-  data_home=`grep "SILVERPEAS_DATA_HOME[ ]*=" "${SILVERPEAS_HOME}/configuration/config.properties"  | cut -d '=' -f 2 | xargs`
-  if [ "Z${data_home}" = "Z" ]; then
-    data_home="${SILVERPEAS_HOME}/data"
-  else
-    data_home=`sed -e "s/{env./{/g" <<< "${data_home}"`
-    data_home=`eval echo -e "${data_home}"`
-  fi
-
-  # figure out now the JCR home directory (by default it is located into the data home directory)
-  jcr_home=`grep "JCR_HOME[ ]*=" "${SILVERPEAS_HOME}/configuration/config.properties"  | cut -d '=' -f 2 | xargs`
-  if [ "Z${jcr_home}" = "Z" ]; then
-    jcr_home="${data_home}/jcr"
-  else    
-    jcr_home=`sed -e "s/SILVERPEAS_DATA_HOME/data_home/g" <<< "${jcr_home}"`
-    jcr_home=`eval echo -e "${jcr_home}"`
-  fi
+echo "Installation of Silverpeas $1"
+/etc/init.d/postgresql start
+test $? -eq 0 || exit $?
 
-  jcr_dir=`dirname ${jcr_home}`
-  if [ -d "${jcr_dir}/jackrabbit" ] && [ ! -d "${jcr_dir}/jcr/segmentstore" ]; then
-    echo "Migrate the JCR from Apache Jackrabbit 2 to Apache Jackrabbit Oak..."
-    if ! /opt/oak-migration/oak-migrate.sh "$jcr_dir/jackrabbit" "$jcr_dir/jcr"; then
-      exit 1
-    fi
-  fi
-}
+sudo -u postgres psql < ../silverpeas.sql
+test $? -eq 0 || exit $?
 
-echo "Installation of Silverpeas $1"
-./h2database start
 ./silverpeas clean install
-migrate_jcr
 ret=$?
 if [ $ret -eq 0 ]; then
-   rm ../log/build-*
-   touch .install
+  rm ../log/build-*
+  touch .install
+  rm ../silverpeas.sql
 else
   echo "An error has occurred :-("
   echo
   for f in ../log/build-*; do
     cat "$f"
   done
 fi
-./h2database stop
-exit $ret
+
+/etc/init.d/postgresql stop
+exit $ret

src/bin/setup.sh

@@ -1,27 +1,8 @@
-# Copyright (C) 2000 - 2022 Silverpeas
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# As a special exception to the terms and conditions of version 3.0 of
-# the GPL, you may redistribute this Program in connection withWriter Free/Libre
-# Open Source Software ("FLOSS") applications as described in Silverpeas's
-# FLOSS exception.  You should have recieved a copy of the text describing
-# the FLOSS exception, and it is also available here:
-# "http://www.silverpeas.org/legal/licensing"
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+SILVERPEAS_USER_LANGUAGE=en
+SILVERPEAS_CONTENT_LANGUAGES=en,fr
 
-DB_SERVERTYPE=H2
+DB_SERVERTYPE=POSTGRESQL
 DB_SERVER=localhost
-DB_USER=silverpeas
+DB_USER=silver
 DB_PASSWORD=silverpeas
-DB_NAME=Silverpeas
+DB_NAME=silverpeas