haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker: update files for the 22.05 release 

Signed-off-by: Aron Budea <aron.budea@collabora.com>
Change-Id: I437b0a4c4eb552579548bc0ede66a8209453d360
pull/5145/head
Aron Budea 2022-08-11 15:25:02 +02:00 committed by thebearon
parent bacb4ed211
commit db713b9c9d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/README
View File

@ -15,19 +15,19 @@ Examples:
cd from-packages
docker build --no-cache -t mydomain/code -f Ubuntu .
2. Build Collabora Online 21.11 based on Ubuntu 18.04 LTS
2. Build Collabora Online 22.05 based on Ubuntu 18.04 LTS
cd from-packages
# Get your secret URL key from https://support.collaboraoffice.com/ (Collabora Partners/Customers)
docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f Ubuntu .
3. Build Collabora Online 21.11 based on RHEL8
3. Build Collabora Online 22.05 based on RHEL8
cd from-packages
# Get your secret URL key from https://support.collaboraoffice.com/ (Collabora Partners/Customers)
docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f RHEL8 .
4. Build Collabora Online 21.11 license key enabled version based on Ubuntu 18.04 LTS
4. Build Collabora Online 22.05 license key enabled version based on Ubuntu 18.04 LTS
cd from-packages
docker build --no-cache --build-arg type=key -t mydomain/cool -f Ubuntu .

4
docker/from-packages/RHEL8
View File

@ -8,8 +8,8 @@ FROM registry.access.redhat.com/ubi8/ubi:8.1
# Optional. The default is 'repos'.
ARG repo
# version: can be '21.11'
# Optional. The default is '21.11'.
# version: can be '22.05' and '21.11'
# Optional. The default is '22.05'.
ARG version
# type: can be

4
docker/from-packages/Ubuntu
View File

@ -8,8 +8,8 @@ FROM ubuntu:18.04
# Optional. The default is 'repos'.
ARG repo
# version: can be '21.11'
# Optional. The default is '21.11'.
# version: can be '22.05' and '21.11'
# Optional. The default is '22.05'.
ARG version
# type: can be

2
docker/from-packages/scripts/install-collabora-online-rhel8.sh
View File

@ -27,7 +27,7 @@ wget https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/CODE-centos8/rep
if [ "$type" == "cool" ] && [ -n ${secret_key+set} ]; then
echo "Based on the provided build arguments Collabora Online from customer repo will be used."
dnf config-manager --add-repo https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-21.11}/customer-centos8-${secret_key}
dnf config-manager --add-repo https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-22.05}/customer-centos8-${secret_key}
elif [ "$type" == "key" ]; then
echo "Based on the provided build arguments license key enabled Collabora Online was selected, but it's available only on Ubuntu. Collabora Online Development Edition will be used."
type="code"

4
docker/from-packages/scripts/install-collabora-online-ubuntu.sh
View File

@ -35,10 +35,10 @@ fi
# Add Collabora repos
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:-21.11}/customer-ubuntu1804-${secret_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}/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:-21.11}-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