ci: Backport #29443 to 8.0 so it installs.

This commit is contained in:
Alex Vandiver 2024-07-26 20:03:13 +00:00 committed by Tim Abbott
parent bf807eabd7
commit 7ad773d79d
2 changed files with 43 additions and 0 deletions

View File

@ -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"

View File

@ -11,9 +11,13 @@ FROM $BASE_IMAGE
# Download the release tarball, start rabbitmq server and install the server # Download the release tarball, start rabbitmq server and install the server
ARG VERSION ARG VERSION
ADD Docker-prod-8.0.diff /tmp
RUN cd $(mktemp -d) \ RUN cd $(mktemp -d) \
&& curl -fLO --retry 3 "https://download.zulip.com/server/zulip-server-$VERSION.tar.gz" \ && curl -fLO --retry 3 "https://download.zulip.com/server/zulip-server-$VERSION.tar.gz" \
&& tar -xf "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 -s "./zulip-server-$VERSION/scripts/setup/install" --self-signed-cert --hostname 127.0.0.1 --email ci@example.com \
&& sudo service rabbitmq-server stop && sudo service rabbitmq-server stop