summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2022-09-18 20:42:23 +0200
committerAndras Timar <andras.timar@collabora.com>2022-09-18 21:03:43 +0200
commitba847a7f58c0e316d4a55631b2530b1182b5d205 (patch)
tree259631a512794dffa85ff6e99030a34b9a6edffa /docker
parentdocker: better handling of customer repo URL (diff)
downloadonline-ba847a7f58c0e316d4a55631b2530b1182b5d205.tar.gz
online-ba847a7f58c0e316d4a55631b2530b1182b5d205.zip
docker: support ppc64le
Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: Ie3ba247471aec999a1af09e5a7140cf70b45ac03
Diffstat (limited to 'docker')
-rw-r--r--docker/from-packages/Ubuntu-ppc64le40
-rwxr-xr-xdocker/from-packages/scripts/install-collabora-online-ubuntu.sh15
2 files changed, 51 insertions, 4 deletions
diff --git a/docker/from-packages/Ubuntu-ppc64le b/docker/from-packages/Ubuntu-ppc64le
new file mode 100644
index 0000000000..75dc834bcf
--- /dev/null
+++ b/docker/from-packages/Ubuntu-ppc64le
@@ -0,0 +1,40 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+FROM ubuntu:20.04
+
+# repo: can be 'repos', 'repos-staging', 'repos-snapshot'
+# Optional. The default is 'repos'.
+ARG repo
+
+# version: can be '22.05' and '21.11'
+# Optional. The default is '22.05'.
+ARG version
+
+# type: can be
+# 'code' - Collabora Online Development Edition
+# 'cool' - Collabora Online, to build this you need to give your secret URL part from https://support.collaboraoffice.com, i.e. you have to be Collabora partner or customer
+# 'key' - Collabora Online, the license key enabled version.
+# Optional. The default is 'code'.
+ARG type
+
+# Environment variables
+ENV LC_CTYPE C.UTF-8
+
+# Setup scripts for Collabora Online
+ADD /scripts/install-collabora-online-ubuntu.sh /
+RUN --mount=type=secret,id=secret_key bash install-collabora-online-ubuntu.sh
+RUN rm -rf /install-collabora-online-ubuntu.sh
+
+# Start script for Collabora Online
+ADD /scripts/start-collabora-online.sh /
+ADD /scripts/start-collabora-online.pl /
+
+EXPOSE 9980
+
+# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
+USER 105
+
+# Entry point
+CMD ["/start-collabora-online.sh"]
diff --git a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
index 760708eb71..d1a3e35ac9 100755
--- a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
+++ b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh
@@ -36,14 +36,21 @@ fi
secret_key=$(cat /run/secrets/secret_key)
if [ "$type" == "cool" ] && [ -n ${secret_key+set} ]; then
echo "Based on the provided build arguments Collabora Online from customer repo will be used."
- echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-ubuntu1804-${secret_key} /" >> /etc/apt/sources.list.d/collabora.list
+ if [ $(uname -i) == "ppc64le" ]; then
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-ubuntu2004-${secret_key} /" > /etc/apt/sources.list.d/collabora.list
+ else
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-ubuntu1804-${secret_key} /" > /etc/apt/sources.list.d/collabora.list
+ fi
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-ubuntu1804-${secret_key} /" > /etc/apt/sources.list.d/collabora.list
elif [ "$type" == "key" ]; then
echo "Based on the provided build arguments license key enabled Collabora Online will be used."
- echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}-key /" >> /etc/apt/sources.list.d/collabora.list
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}-key /" > /etc/apt/sources.list.d/collabora.list
else
echo "Based on the provided build arguments Collabora Online Development Edition will be used."
- if [ $(uname -i) == "aarch64" ]; then
- echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/CODE-arm64-ubuntu1804 /" >> /etc/apt/sources.list.d/collabora.list
+ if [ $(uname -i) == "ppc64le" ]; then
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/repos-staging/CollaboraOnline/CODE-ubuntu2004 /" > /etc/apt/sources.list.d/collabora.list
+ elif [ $(uname -i) == "aarch64" ]; then
+ echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/CODE-arm64-ubuntu1804 /" > /etc/apt/sources.list.d/collabora.list
else
echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/CODE-ubuntu1804 /" > /etc/apt/sources.list.d/collabora.list
fi