fixes #9: merge changes from CODE

timar · timar · commit e024a6c2a349 · 2020-03-05T09:15:05.000+01:00
* Ubuntu 18.04 based
* non-root docker container
* Use Collabora Online 4.2
* Include OpenSans font
* Misc fixes
diff --git a/baseimage/Dockerfile b/baseimage/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Environment variables
 ARG SECRET_KEY
diff --git a/baseimage/scripts/install-libreoffice.sh b/baseimage/scripts/install-libreoffice.sh
@@ -1,25 +1,38 @@
 #!/bin/sh
 
-# Update installed packages
-apt-get update && apt-get -y upgrade
+# Refresh repos otherwise installations later may fail
+apt-get update
 
-# Install HTTPS transport
+# Install HTTPS transport
 apt-get -y install apt-transport-https
 
 # Install locales
 apt-get -y install locales-all
 
+# Install some more fonts
+apt-get -y install fonts-open-sans
+
+# Install gnupg2
+apt-get -y install gnupg2
+
+# install ca-certificates
+apt-get -y install ca-certificates
+
 # Add Collabora repos
-echo "deb https://collaboraoffice.com/${REPOS:-repos}/CollaboraOnline/4/customer-ubuntu1604-${SECRET_KEY} /" >> /etc/apt/sources.list.d/collabora.list
+echo "deb https://collaboraoffice.com/${REPOS:-repos}/CollaboraOnline/4.2/customer-ubuntu1804-${SECRET_KEY} /" >> /etc/apt/sources.list.d/collabora.list
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6CCEA47B2281732DF5D504D00C54D189F4BA284D
 apt-get update
 
 # Install the Collabora packages
-apt-get -y install loolwsd collabora-online-brand collaboraoffice6.0-dict* collaboraofficebasis6.0*
+apt-get -y install loolwsd collabora-online-brand collaboraoffice6.2-dict* collaboraofficebasis6.2-ar collaboraofficebasis6.2-as collaboraofficebasis6.2-ast collaboraofficebasis6.2-bg collaboraofficebasis6.2-bn-in collaboraofficebasis6.2-br collaboraofficebasis6.2-ca collaboraofficebasis6.2-calc collaboraofficebasis6.2-ca-valencia collaboraofficebasis6.2-core collaboraofficebasis6.2-cs collaboraofficebasis6.2-cy collaboraofficebasis6.2-da collaboraofficebasis6.2-de collaboraofficebasis6.2-draw collaboraofficebasis6.2-el collaboraofficebasis6.2-en-gb collaboraofficebasis6.2-en-us collaboraofficebasis6.2-es collaboraofficebasis6.2-et collaboraofficebasis6.2-eu collaboraofficebasis6.2-extension-pdf-import collaboraofficebasis6.2-fi collaboraofficebasis6.2-fr collaboraofficebasis6.2-ga collaboraofficebasis6.2-gd collaboraofficebasis6.2-gl collaboraofficebasis6.2-graphicfilter collaboraofficebasis6.2-gu collaboraofficebasis6.2-he collaboraofficebasis6.2-hi collaboraofficebasis6.2-hr collaboraofficebasis6.2-hu collaboraofficebasis6.2-id collaboraofficebasis6.2-images collaboraofficebasis6.2-impress collaboraofficebasis6.2-is collaboraofficebasis6.2-it collaboraofficebasis6.2-ja collaboraofficebasis6.2-km collaboraofficebasis6.2-kn collaboraofficebasis6.2-ko collaboraofficebasis6.2-lt collaboraofficebasis6.2-lv collaboraofficebasis6.2-ml collaboraofficebasis6.2-mr collaboraofficebasis6.2-nb collaboraofficebasis6.2-nl collaboraofficebasis6.2-nn collaboraofficebasis6.2-oc collaboraofficebasis6.2-ooofonts collaboraofficebasis6.2-ooolinguistic collaboraofficebasis6.2-or collaboraofficebasis6.2-pa-in collaboraofficebasis6.2-pl collaboraofficebasis6.2-pt collaboraofficebasis6.2-pt-br collaboraofficebasis6.2-ro collaboraofficebasis6.2-ru collaboraofficebasis6.2-sk collaboraofficebasis6.2-sl collaboraofficebasis6.2-sr collaboraofficebasis6.2-sr-latn collaboraofficebasis6.2-sv collaboraofficebasis6.2-ta collaboraofficebasis6.2-te collaboraofficebasis6.2-tr collaboraofficebasis6.2-uk collaboraofficebasis6.2-vi collaboraofficebasis6.2-writer collaboraofficebasis6.2-zh-cn collaboraofficebasis6.2-zh-tw
 
 # Install inotifywait and killall to automatic restart loolwsd, if loolwsd.xml changes
 apt-get -y install inotify-tools psmisc
 
 # Cleanup
 rm -rf /var/lib/apt/lists/*
 rm -rf /etc/apt/sources.list.d/collabora.list
+
+# Fix permissions
+chown -R lool:lool /opt/
+chown -R lool:lool /etc/loolwsd
diff --git a/baseimage/scripts/start-libreoffice.sh b/baseimage/scripts/start-libreoffice.sh
@@ -8,15 +8,16 @@ if test "${DONT_GEN_SSL_CERT-set}" == set; then
 mkdir -p /opt/ssl/
 cd /opt/ssl/
 mkdir -p certs/ca
+openssl rand -writerand /opt/lool/.rnd
 openssl genrsa -out certs/ca/root.key.pem 2048
 openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out certs/ca/root.crt.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=Dummy Authority"
 mkdir -p certs/{servers,tmp}
-mkdir -p "certs/servers/localhost"
-openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 -key "certs/servers/localhost/privkey.pem"
+mkdir -p certs/servers/localhost
+openssl genrsa -out certs/servers/localhost/privkey.pem 2048
 if test "${cert_domain-set}" == set; then
-openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
+openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
 else
-openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
+openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
 fi
 openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem -CAkey certs/ca/root.key.pem -CAcreateserial -out certs/servers/localhost/cert.pem -days 9131
 mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem
@@ -38,5 +39,6 @@ perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_language
 	/usr/bin/killall -1 loolwsd
 ) &
 
+
 # Start loolwsd
-su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice6.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}" -s /bin/bash lool
+/bin/bash -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}"
diff --git a/key/Dockerfile b/key/Dockerfile
@@ -1,19 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Environment variables
 ARG REPOS
+ENV domain localhost
+ENV LC_CTYPE en_US.UTF-8
 
 # Setup scripts for LibreOffice Online
 ADD /scripts/install-libreoffice.sh /
 ADD /scripts/start-libreoffice.sh /
 RUN bash install-libreoffice.sh
 RUN rm -rf /install-libreoffice.sh
 
-# Environment variables
-ENV domain localhost
-ENV LC_CTYPE en_US.UTF-8
-
 EXPOSE 9980
 
+# switch to lool user
+USER 101
+
 # Entry point
 CMD bash start-libreoffice.sh
diff --git a/key/scripts/install-libreoffice.sh b/key/scripts/install-libreoffice.sh
@@ -1,25 +1,38 @@
 #!/bin/sh
 
-# Update installed packages
-apt-get update && apt-get -y upgrade
+# Refresh repos otherwise installations later may fail
+apt-get update
 
-# Install HTTPS transport
+# Install HTTPS transport
 apt-get -y install apt-transport-https
 
 # Install locales
 apt-get -y install locales-all
 
+# Install some more fonts
+apt-get -y install fonts-open-sans
+
+# Install gnupg2
+apt-get -y install gnupg2
+
+# install ca-certificates
+apt-get -y install ca-certificates
+
 # Add Collabora repos
-echo "deb https://collaboraoffice.com/${REPOS:-repos}/CollaboraOnline/4-key /" >> /etc/apt/sources.list.d/collabora.list
+echo "deb https://collaboraoffice.com/${REPOS:-repos}/CollaboraOnline/4.2-key /" >> /etc/apt/sources.list.d/collabora.list
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6CCEA47B2281732DF5D504D00C54D189F4BA284D
 apt-get update
 
 # Install the Collabora packages
-apt-get -y install loolwsd collabora-online-brand collaboraoffice6.0-dict* collaboraofficebasis6.0*
+apt-get -y install loolwsd collabora-online-brand collaboraoffice6.2-dict* collaboraofficebasis6.2-ar collaboraofficebasis6.2-as collaboraofficebasis6.2-ast collaboraofficebasis6.2-bg collaboraofficebasis6.2-bn-in collaboraofficebasis6.2-br collaboraofficebasis6.2-ca collaboraofficebasis6.2-calc collaboraofficebasis6.2-ca-valencia collaboraofficebasis6.2-core collaboraofficebasis6.2-cs collaboraofficebasis6.2-cy collaboraofficebasis6.2-da collaboraofficebasis6.2-de collaboraofficebasis6.2-draw collaboraofficebasis6.2-el collaboraofficebasis6.2-en-gb collaboraofficebasis6.2-en-us collaboraofficebasis6.2-es collaboraofficebasis6.2-et collaboraofficebasis6.2-eu collaboraofficebasis6.2-extension-pdf-import collaboraofficebasis6.2-fi collaboraofficebasis6.2-fr collaboraofficebasis6.2-ga collaboraofficebasis6.2-gd collaboraofficebasis6.2-gl collaboraofficebasis6.2-graphicfilter collaboraofficebasis6.2-gu collaboraofficebasis6.2-he collaboraofficebasis6.2-hi collaboraofficebasis6.2-hr collaboraofficebasis6.2-hu collaboraofficebasis6.2-id collaboraofficebasis6.2-images collaboraofficebasis6.2-impress collaboraofficebasis6.2-is collaboraofficebasis6.2-it collaboraofficebasis6.2-ja collaboraofficebasis6.2-km collaboraofficebasis6.2-kn collaboraofficebasis6.2-ko collaboraofficebasis6.2-lt collaboraofficebasis6.2-lv collaboraofficebasis6.2-ml collaboraofficebasis6.2-mr collaboraofficebasis6.2-nb collaboraofficebasis6.2-nl collaboraofficebasis6.2-nn collaboraofficebasis6.2-oc collaboraofficebasis6.2-ooofonts collaboraofficebasis6.2-ooolinguistic collaboraofficebasis6.2-or collaboraofficebasis6.2-pa-in collaboraofficebasis6.2-pl collaboraofficebasis6.2-pt collaboraofficebasis6.2-pt-br collaboraofficebasis6.2-ro collaboraofficebasis6.2-ru collaboraofficebasis6.2-sk collaboraofficebasis6.2-sl collaboraofficebasis6.2-sr collaboraofficebasis6.2-sr-latn collaboraofficebasis6.2-sv collaboraofficebasis6.2-ta collaboraofficebasis6.2-te collaboraofficebasis6.2-tr collaboraofficebasis6.2-uk collaboraofficebasis6.2-vi collaboraofficebasis6.2-writer collaboraofficebasis6.2-zh-cn collaboraofficebasis6.2-zh-tw
 
 # Install inotifywait and killall to automatic restart loolwsd, if loolwsd.xml changes
 apt-get -y install inotify-tools psmisc
 
 # Cleanup repositories since we don't want to leak our secret key
 rm -rf /var/lib/apt/lists/*
 rm -rf /etc/apt/sources.list.d/collabora.list
+
+# Fix permissions
+chown -R lool:lool /opt/
+chown -R lool:lool /etc/loolwsd
diff --git a/key/scripts/start-libreoffice.sh b/key/scripts/start-libreoffice.sh
@@ -8,15 +8,16 @@ if test "${DONT_GEN_SSL_CERT-set}" == set; then
 mkdir -p /opt/ssl/
 cd /opt/ssl/
 mkdir -p certs/ca
+openssl rand -writerand /opt/lool/.rnd
 openssl genrsa -out certs/ca/root.key.pem 2048
 openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out certs/ca/root.crt.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=Dummy Authority"
 mkdir -p certs/{servers,tmp}
-mkdir -p "certs/servers/localhost"
-openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 -key "certs/servers/localhost/privkey.pem"
+mkdir -p certs/servers/localhost
+openssl genrsa -out certs/servers/localhost/privkey.pem 2048
 if test "${cert_domain-set}" == set; then
-openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
+openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
 else
-openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
+openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
 fi
 openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem -CAkey certs/ca/root.key.pem -CAcreateserial -out certs/servers/localhost/cert.pem -days 9131
 mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem
@@ -38,5 +39,6 @@ perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_language
 	/usr/bin/killall -1 loolwsd
 ) &
 
+
 # Start loolwsd
-su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice6.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}" -s /bin/bash lool
+/bin/bash -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}"
diff --git a/online/Dockerfile b/online/Dockerfile
@@ -6,5 +6,8 @@ ENV LC_CTYPE en_US.UTF-8
 
 EXPOSE 9980
 
+# switch to lool user
+USER 101
+
 # Entry point
 CMD bash start-libreoffice.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:16.04`
	`1`	`+FROM ubuntu:18.04`
`2`	`2`
`3`	`3`	`# Environment variables`
`4`	`4`	`ARG SECRET_KEY`