1
- FROM ubuntu:bionic
1
+ FROM ubuntu:focal
2
2
3
3
MAINTAINER Miguel Moquillon "miguel.moquillon@silverpeas.org"
4
4
@@ -10,15 +10,22 @@ ENV TERM=xterm
10
10
11
11
# Installation of LibreOffice, ImageMagick, Ghostscript, and then
12
12
# 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 \
14
19
wget \
15
20
vim \
16
21
locales \
22
+ language-pack-en \
23
+ language-pack-fr \
17
24
procps \
18
25
net-tools \
19
26
zip \
20
27
unzip \
21
- openjdk-8 -jdk \
28
+ openjdk-11 -jdk \
22
29
ffmpeg \
23
30
imagemagick \
24
31
ghostscript \
@@ -44,7 +51,7 @@ RUN wget -nc https://www.silverpeas.org/files/pdf2json-bin-0.68.zip \
44
51
# Set up environment to install and to run Silverpeas
45
52
#
46
53
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.
48
55
ARG DEFAULT_LOCALE=en_US.UTF-8
49
56
50
57
# Generate locales and set the default one
@@ -73,16 +80,16 @@ RUN { \
73
80
&& chmod +x /usr/local/bin/docker-java-home
74
81
75
82
# 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
77
84
78
85
# Set up environment variables for Silverpeas
79
86
ENV JAVA_HOME /docker-java-home
80
87
ENV SILVERPEAS_HOME /opt/silverpeas
81
88
ENV JBOSS_HOME /opt/wildfly
82
89
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
86
93
87
94
# Fetch both Silverpeas and Wildfly and unpack them into /opt
88
95
RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-wildfly${WILDFLY_VERSION%.?.?}.zip \
@@ -111,7 +118,7 @@ WORKDIR ${SILVERPEAS_HOME}/bin
111
118
COPY src/run.sh /opt/
112
119
COPY src/converter.groovy ${SILVERPEAS_HOME}/configuration/silverpeas/
113
120
114
- # Construct Silverpeas
121
+ # Assemble Silverpeas
115
122
RUN sed -i -e "s/SILVERPEAS_VERSION/${SILVERPEAS_VERSION}/g" ${SILVERPEAS_HOME}/bin/silverpeas.gradle \
116
123
&& ./silverpeas construct \
117
124
&& rm ../log/build-* \
0 commit comments