From 7ad773d79dbdf8462a79bacb66e413e5b1a2b9e3 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Fri, 26 Jul 2024 20:03:13 +0000
Subject: [PATCH] ci: Backport #29443 to 8.0 so it installs.

---
 tools/ci/Docker-prod-8.0.diff | 39 +++++++++++++++++++++++++++++++++++
 tools/ci/Dockerfile.prod      |  4 ++++
 2 files changed, 43 insertions(+)
 create mode 100644 tools/ci/Docker-prod-8.0.diff

diff --git a/tools/ci/Docker-prod-8.0.diff b/tools/ci/Docker-prod-8.0.diff
new file mode 100644
index 0000000000..6e522b84f1
--- /dev/null
+++ b/tools/ci/Docker-prod-8.0.diff
@@ -0,0 +1,39 @@
+diff --git scripts/setup/apt-repos/zulip/custom.sh scripts/setup/apt-repos/zulip/custom.sh
+index be7c780b7e..ee363c7d65 100755
+--- scripts/setup/apt-repos/zulip/custom.sh
++++ scripts/setup/apt-repos/zulip/custom.sh
+@@ -2,7 +2,6 @@
+ set -euo pipefail
+ 
+ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
+-    arrow_keyring=$(readlink -f "$LIST_PATH/apache-arrow-keyring.gpg")
+     pgroonga_apt_sign_key=$(readlink -f "$LIST_PATH/pgroonga-packages.groonga.org.asc")
+ 
+     remove_pgroonga_apt_tmp_dir() {
+@@ -28,16 +27,6 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
+             read -r release
+         } <<<"$os_info"
+ 
+-        if [ "$distribution" = debian ] && [ "$release" = bookworm ]; then
+-            # As of Debian 12, the Groonga repository depends on the
+-            # Apache Arrow repository.
+-            arrow_apt_source_deb="apache-arrow-apt-source-latest-$release.deb"
+-            arrow_apt_source_deb_sign="$arrow_apt_source_deb.asc"
+-            curl -fLO --retry 3 "https://apache.jfrog.io/artifactory/arrow/$distribution/$arrow_apt_source_deb"
+-            curl -fLO --retry 3 "https://apache.jfrog.io/artifactory/arrow/$distribution/$arrow_apt_source_deb_sign"
+-            gpgv --keyring="$arrow_keyring" "$arrow_apt_source_deb_sign" "$arrow_apt_source_deb"
+-        fi
+-
+         groonga_apt_source_deb="groonga-apt-source-latest-$release.deb"
+         groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint"
+         curl -fLO --retry 3 "https://packages.groonga.org/$distribution/$groonga_apt_source_deb"
+@@ -53,9 +42,6 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
+         #   accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied)
+         chown _apt .
+ 
+-        if [ "$distribution" = debian ] && [ "$release" = bookworm ]; then
+-            apt-get -y install "./$arrow_apt_source_deb"
+-        fi
+         apt-get -y install "./$groonga_apt_source_deb"
+     }
+     touch "$STAMP_FILE"
diff --git a/tools/ci/Dockerfile.prod b/tools/ci/Dockerfile.prod
index e49715821d..8f5deec61e 100644
--- a/tools/ci/Dockerfile.prod
+++ b/tools/ci/Dockerfile.prod
@@ -11,9 +11,13 @@ FROM $BASE_IMAGE
 
 # Download the release tarball, start rabbitmq server and install the server
 ARG VERSION
+ADD Docker-prod-8.0.diff /tmp
 RUN cd $(mktemp -d) \
   && curl -fLO --retry 3 "https://download.zulip.com/server/zulip-server-$VERSION.tar.gz" \
   && tar -xf "zulip-server-$VERSION.tar.gz" \
+  && if [ "$VERSION" = "8.0" ]; then \
+         cat /tmp/Docker-prod-8.0.diff | patch -p0 -d "zulip-server-$VERSION"; \
+     fi \
   && sudo -s "./zulip-server-$VERSION/scripts/setup/install" --self-signed-cert --hostname 127.0.0.1 --email ci@example.com \
   && sudo service rabbitmq-server stop