Skip to content

Commit 558d384

Browse files
silverusermmoqui
silveruser
authored andcommitted
Generate Dockerfile for Silverpeas 6.2
1 parent b8beb2a commit 558d384

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

Dockerfile

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:focal
22

33
MAINTAINER Miguel Moquillon "miguel.moquillon@silverpeas.org"
44

@@ -10,15 +10,22 @@ ENV TERM=xterm
1010

1111
# Installation of LibreOffice, ImageMagick, Ghostscript, and then
1212
# the dependencies required to run SWFTools and PDF2JSON
13-
RUN apt-get update && apt-get install -y \
13+
RUN apt-get update \
14+
&& apt-get install -y tzdata \
15+
&& apt-get install -y \
16+
apt-utils \
17+
iputils-ping \
18+
curl \
1419
wget \
1520
vim \
1621
locales \
22+
language-pack-en \
23+
language-pack-fr \
1724
procps \
1825
net-tools \
1926
zip \
2027
unzip \
21-
openjdk-8-jdk \
28+
openjdk-11-jdk \
2229
ffmpeg \
2330
imagemagick \
2431
ghostscript \
@@ -44,7 +51,7 @@ RUN wget -nc https://www.silverpeas.org/files/pdf2json-bin-0.68.zip \
4451
# Set up environment to install and to run Silverpeas
4552
#
4653

47-
# Default locale of the platform. It can be overriden to build an image for a specific locale other than en_US.UTF-8.
54+
# Default locale of the platform. It can be overridden to build an image for a specific locale other than en_US.UTF-8.
4855
ARG DEFAULT_LOCALE=en_US.UTF-8
4956

5057
# Generate locales and set the default one
@@ -73,16 +80,16 @@ RUN { \
7380
&& chmod +x /usr/local/bin/docker-java-home
7481

7582
# do some fancy footwork to create a JAVA_HOME that's cross-architecture-safe
76-
RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-java-home
83+
RUN ln -svT "/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)" /docker-java-home
7784

7885
# Set up environment variables for Silverpeas
7986
ENV JAVA_HOME /docker-java-home
8087
ENV SILVERPEAS_HOME /opt/silverpeas
8188
ENV JBOSS_HOME /opt/wildfly
8289

83-
ENV SILVERPEAS_VERSION=6.1
84-
ENV WILDFLY_VERSION=18.0.1
85-
LABEL name="Silverpeas 6" description="Image to install and to run Silverpeas 6" vendor="Silverpeas" version="6.1" build=2
90+
ENV SILVERPEAS_VERSION=6.2
91+
ENV WILDFLY_VERSION=20.0.1
92+
LABEL name="Silverpeas 6.2" description="Image to install and to run Silverpeas 6.2" vendor="Silverpeas" version="6.2" build=1
8693

8794
# Fetch both Silverpeas and Wildfly and unpack them into /opt
8895
RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-wildfly${WILDFLY_VERSION%.?.?}.zip \
@@ -111,7 +118,7 @@ WORKDIR ${SILVERPEAS_HOME}/bin
111118
COPY src/run.sh /opt/
112119
COPY src/converter.groovy ${SILVERPEAS_HOME}/configuration/silverpeas/
113120

114-
# Construct Silverpeas
121+
# Assemble Silverpeas
115122
RUN sed -i -e "s/SILVERPEAS_VERSION/${SILVERPEAS_VERSION}/g" ${SILVERPEAS_HOME}/bin/silverpeas.gradle \
116123
&& ./silverpeas construct \
117124
&& rm ../log/build-* \

Dockerfile.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ ENV TERM=xterm
1010

1111
# Installation of LibreOffice, ImageMagick, Ghostscript, and then
1212
# the dependencies required to run SWFTools and PDF2JSON
13-
RUN apt-get update && apt-get install -y \
13+
RUN apt-get update \
14+
&& apt-get install -y tzdata \
15+
&& apt-get install -y \
1416
apt-utils \
1517
iputils-ping \
1618
curl \

0 commit comments

Comments
 (0)