Revert "docker: update URLs used"

This reverts commit 4356314. Reason: we stick with collaboraoffice.com for downloads. Signed-off-by: Andras Timar <[email protected]> Change-Id: I4b5d6a0acf8aeb4fb7e6e8b6afaecf169b9fed87
meven · Aug 22, 2024 · f75994a · f75994a
1 parent 915abbd
commit f75994a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docker/from-packages/Dockerfile b/docker/from-packages/Dockerfile
@@ -43,7 +43,7 @@ RUN --mount=type=secret,id=secret_key \
 # Install dependencies of installer of Collabora Online
     apt-get -y install cpio tzdata libcap2-bin apt-transport-https gnupg2 ca-certificates curl && \
 # Setup Collabora repo
-    repourl="https://collaboraonline.com/${repo:-repos}/CollaboraOnline/"; \
+    repourl="https://collaboraoffice.com/${repo:-repos}/CollaboraOnline/"; \
     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."; \
@@ -58,10 +58,10 @@ RUN --mount=type=secret,id=secret_key \
     echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] ${repourl} /" > /etc/apt/sources.list.d/collabora.list && \
 # Download Collabora package signing key
     if [ "$repo" = "repos-snapshot" ]; then \
-        curl -L https://www.collaboraonline.com/downloads/gpg/collaboraonline-snapshot-keyring.gpg --output /usr/share/keyrings/collaboraonline-snapshot-keyring.gpg; \
+        curl https://www.collaboraoffice.com/downloads/gpg/collaboraonline-snapshot-keyring.gpg --output /usr/share/keyrings/collaboraonline-snapshot-keyring.gpg; \
         sed -i "s/collaboraonline-release-keyring/collaboraonline-snapshot-keyring/" /etc/apt/sources.list.d/collabora.list; \
     else \
-        curl -L https://www.collaboraonline.com/downloads/gpg/collaboraonline-release-keyring.gpg --output /usr/share/keyrings/collaboraonline-release-keyring.gpg; \
+        curl https://www.collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg --output /usr/share/keyrings/collaboraonline-release-keyring.gpg; \
     fi && \
 # Update repos again
     apt-get update && \