docker: update files for upcoming 21.11 release
Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: Id4b572e4970844a7da7ff64603483d67f13285c2pull/3620/head
Andras Timar
parent
4873480d63
commit
e668110461
|
|
@ -12,18 +12,19 @@ Examples:
|
|||
cd from-packages
|
||||
docker build --no-cache -t mydomain/code -f Ubuntu .
|
||||
|
||||
2. Build Collabora Online 6.4
|
||||
|
||||
cd from-packages
|
||||
docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f Ubuntu .
|
||||
|
||||
3. Build Collabora Online 4.2 based on RHEL8
|
||||
2. Build Collabora Online 21.11 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 version=4.2 --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f RHEL8 .
|
||||
docker build --no-cache --build-arg type=cool --build-arg secret_key=<....> -t mydomain/cool -f Ubuntu .
|
||||
|
||||
4. Build Collabora Online 6.4 license key enabled version
|
||||
3. Build Collabora Online 21.11 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
|
||||
|
||||
cd from-packages
|
||||
docker build --no-cache --build-arg type=key -t mydomain/cool -f Ubuntu .
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ FROM registry.access.redhat.com/ubi8/ubi:8.1
|
|||
# Optional. The default is 'repos'.
|
||||
ARG repo
|
||||
|
||||
# version: can be '4.2', '6.4'
|
||||
# Optional. The default is '6.4'.
|
||||
# version: can be '21.11'
|
||||
# Optional. The default is '21.11'.
|
||||
ARG version
|
||||
|
||||
# type: can be
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ FROM ubuntu:18.04
|
|||
# Optional. The default is 'repos'.
|
||||
ARG repo
|
||||
|
||||
# version: can be '4.2', '6.4'
|
||||
# Optional. The default is '6.4'.
|
||||
# version: can be '21.11'
|
||||
# Optional. The default is '21.11'.
|
||||
ARG version
|
||||
|
||||
# type: can be
|
||||
|
|
|
|||
|
|
@ -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:-6.4}/customer-centos8-${secret_key}
|
||||
dnf config-manager --add-repo https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/${version:-21.11}/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"
|
||||
|
|
@ -38,15 +38,8 @@ else
|
|||
fi
|
||||
|
||||
# Install the Collabora packages
|
||||
if [ "$version" == "4.2" ] && [ "$type" != "code" ]; then
|
||||
corever=6.2
|
||||
elif [ "$version" == "6.4" ] && [ "$type" != "code" ]; then
|
||||
corever=6.4
|
||||
else
|
||||
corever=
|
||||
fi
|
||||
|
||||
dnf install -y coolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-IN collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-GB collaboraofficebasis$corever-en-US collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-IN collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-BR collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-Latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-CN collaboraofficebasis$corever-zh-TW
|
||||
dnf install -y coolwsd collaboraoffice-dict* collaboraofficebasis-ar collaboraofficebasis-as collaboraofficebasis-ast collaboraofficebasis-bg collaboraofficebasis-bn-IN collaboraofficebasis-br collaboraofficebasis-ca collaboraofficebasis-calc collaboraofficebasis-ca-valencia collaboraofficebasis-core collaboraofficebasis-cs collaboraofficebasis-cy collaboraofficebasis-da collaboraofficebasis-de collaboraofficebasis-draw collaboraofficebasis-el collaboraofficebasis-en-GB collaboraofficebasis-en-US collaboraofficebasis-es collaboraofficebasis-et collaboraofficebasis-eu collaboraofficebasis-extension-pdf-import collaboraofficebasis-fi collaboraofficebasis-fr collaboraofficebasis-ga collaboraofficebasis-gd collaboraofficebasis-gl collaboraofficebasis-graphicfilter collaboraofficebasis-gu collaboraofficebasis-he collaboraofficebasis-hi collaboraofficebasis-hr collaboraofficebasis-hu collaboraofficebasis-id collaboraofficebasis-images collaboraofficebasis-impress collaboraofficebasis-is collaboraofficebasis-it collaboraofficebasis-ja collaboraofficebasis-km collaboraofficebasis-kn collaboraofficebasis-ko collaboraofficebasis-lt collaboraofficebasis-lv collaboraofficebasis-ml collaboraofficebasis-mr collaboraofficebasis-nb collaboraofficebasis-nl collaboraofficebasis-nn collaboraofficebasis-oc collaboraofficebasis-ooofonts collaboraofficebasis-ooolinguistic collaboraofficebasis-or collaboraofficebasis-pa-IN collaboraofficebasis-pl collaboraofficebasis-pt collaboraofficebasis-pt-BR collaboraofficebasis-ro collaboraofficebasis-ru collaboraofficebasis-sk collaboraofficebasis-sl collaboraofficebasis-sr collaboraofficebasis-sr-Latn collaboraofficebasis-sv collaboraofficebasis-ta collaboraofficebasis-te collaboraofficebasis-tr collaboraofficebasis-uk collaboraofficebasis-vi collaboraofficebasis-writer collaboraofficebasis-zh-CN collaboraofficebasis-zh-TW
|
||||
|
||||
if [ "$type" == "cool" ] || [ "$type" == "key" ]; then
|
||||
dnf -y install collabora-online-brand
|
||||
|
|
|
|||
|
|
@ -32,10 +32,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:-6.4}/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:-21.11}/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:-6.4}-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:-21.11}-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
|
||||
|
|
@ -54,15 +54,7 @@ fi
|
|||
apt-get update
|
||||
|
||||
# Install the Collabora packages
|
||||
if [ "$version" == "4.2" ] && [ "$type" != "code" ]; then
|
||||
corever=6.2
|
||||
elif [ "$version" == "6.4" ] && [ "$type" != "code" ]; then
|
||||
corever=6.4
|
||||
else
|
||||
corever=
|
||||
fi
|
||||
|
||||
apt-get -y install coolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-in collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-gb collaboraofficebasis$corever-en-us collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-in collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-br collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-cn collaboraofficebasis$corever-zh-tw
|
||||
apt-get -y install coolwsd collaboraoffice-dict* collaboraofficebasis-ar collaboraofficebasis-as collaboraofficebasis-ast collaboraofficebasis-bg collaboraofficebasis-bn-in collaboraofficebasis-br collaboraofficebasis-ca collaboraofficebasis-calc collaboraofficebasis-ca-valencia collaboraofficebasis-core collaboraofficebasis-cs collaboraofficebasis-cy collaboraofficebasis-da collaboraofficebasis-de collaboraofficebasis-draw collaboraofficebasis-el collaboraofficebasis-en-gb collaboraofficebasis-en-us collaboraofficebasis-es collaboraofficebasis-et collaboraofficebasis-eu collaboraofficebasis-extension-pdf-import collaboraofficebasis-fi collaboraofficebasis-fr collaboraofficebasis-ga collaboraofficebasis-gd collaboraofficebasis-gl collaboraofficebasis-graphicfilter collaboraofficebasis-gu collaboraofficebasis-he collaboraofficebasis-hi collaboraofficebasis-hr collaboraofficebasis-hu collaboraofficebasis-id collaboraofficebasis-images collaboraofficebasis-impress collaboraofficebasis-is collaboraofficebasis-it collaboraofficebasis-ja collaboraofficebasis-km collaboraofficebasis-kn collaboraofficebasis-ko collaboraofficebasis-lt collaboraofficebasis-lv collaboraofficebasis-ml collaboraofficebasis-mr collaboraofficebasis-nb collaboraofficebasis-nl collaboraofficebasis-nn collaboraofficebasis-oc collaboraofficebasis-ooofonts collaboraofficebasis-ooolinguistic collaboraofficebasis-or collaboraofficebasis-pa-in collaboraofficebasis-pl collaboraofficebasis-pt collaboraofficebasis-pt-br collaboraofficebasis-ro collaboraofficebasis-ru collaboraofficebasis-sk collaboraofficebasis-sl collaboraofficebasis-sr collaboraofficebasis-sr-latn collaboraofficebasis-sv collaboraofficebasis-ta collaboraofficebasis-te collaboraofficebasis-tr collaboraofficebasis-uk collaboraofficebasis-vi collaboraofficebasis-writer collaboraofficebasis-zh-cn collaboraofficebasis-zh-tw
|
||||
|
||||
if [ "$type" == "cool" ] || [ "$type" == "key" ]; then
|
||||
apt-get -y install collabora-online-brand
|
||||
|
|
|
|||
Loading…
Reference in New Issue