test

fauust · Jan 18, 2024 · e9bdf78 · e9bdf78
1 parent b4a613f
commit e9bdf78
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile
@@ -76,33 +76,34 @@ RUN . /etc/os-release; \
     && if [ "$(getconf LONG_BIT)" = 64 ]; then \
       apt-get -y install --no-install-recommends galera-4; \
     fi \
-    && if [ "${VERSION_CODENAME}" != bionic ]; then \
+    && if [ "${VERSION_ID}" != 18.04 ]; then \
       apt-get -y install --no-install-recommends flex; \
     fi \
-    && if [ "${VERSION_CODENAME}" = jammy ]; then \
+    && if [ "${VERSION_ID}" = 22.04 ]; then \
       apt-get -y install --no-install-recommends clang-14 libpcre3-dev llvm; \
     fi \
     # see: https://jira.mariadb.org/browse/MDBF-637 \
-    && case "$(arch)" in "x86_64") \
-        deb_arch="amd64"; \
-        ;; \
-        "x86") \
-        deb_arch="i386" \
-        ;; \
-        "aarch64") \
-        deb_arch="arm64" \
-        ;; \
-        "ppc64le") \
-        deb_arch="ppc64el" \
-        ;; \
-        "s390x") \
-        deb_arch="s390x" \
-        ;; \
-      esac \
-    && reprepro_version="5.4.3-1" \
-    && curl -skO "http://ftp.debian.org/debian/pool/main/r/reprepro/reprepro_${reprepro_version}_${deb_arch}.deb" \
-    && apt-get install -y --no-install-recommends "./reprepro_${reprepro_version}_${deb_arch}.deb" \
-    && rm -f "./reprepro_${reprepro_version}_${deb_arch}.deb" \
+    && if [ "${VERSION_ID}" = 22.04 ] && [ "$(arch)" != s390x ]; then \
+         case "$(arch)" in "x86_64") \
+          deb_arch="amd64"; \
+          ;; \
+          "x86") \
+          deb_arch="i386" \
+          ;; \
+          "aarch64") \
+          deb_arch="arm64" \
+          ;; \
+          "ppc64le") \
+          deb_arch="ppc64el" \
+          ;; \
+        esac; \
+        reprepro_version="5.4.3-1"; \
+        curl -skO "http://ftp.debian.org/debian/pool/main/r/reprepro/reprepro_${reprepro_version}_${deb_arch}.deb"; \
+        apt-get install -y --no-install-recommends "./reprepro_${reprepro_version}_${deb_arch}.deb"; \
+        rm -f "./reprepro_${reprepro_version}_${deb_arch}.deb"; \
+      else \
+        apt-get install -y --no-install-recommends reprepro; \
+      fi \
     && apt-get clean
 
 ENV WSREP_PROVIDER=/usr/lib/galera/libgalera_smm.so