Fix centos 7 (#91)

Though we should probably also stop using it soon
edgedb · Jul 3, 2024 · b2be47d · b2be47d
1 parent 3f9c22b
commit b2be47d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/integration/linux/build/Dockerfile-centos.template b/integration/linux/build/Dockerfile-centos.template
@@ -11,7 +11,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 
 RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
     && source /etc/os-release; \
-     [ "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
     && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
     && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
     && yum update -y) || true)

diff --git a/integration/linux/build/Dockerfile-linux.template b/integration/linux/build/Dockerfile-linux.template
@@ -20,6 +20,13 @@ ENV NODE_VERSION %%PLACEHOLDER%%
 ENV YARN_VERSION %%PLACEHOLDER%%
 ENV GCC_VERSION 11
 
+RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
+    && source /etc/os-release; \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+    && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
+    && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
+    && yum update -y) || true)
+
 # rpm on centos 7 iterates over all fds up to the limit, which is
 # extremely slow. Force it to be small.
 RUN ulimit -n 1024 \

diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile
@@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 
 RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
     && source /etc/os-release; \
-     [ "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
     && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
     && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
     && yum update -y) || true)

diff --git a/integration/linux/build/centos-8/Dockerfile b/integration/linux/build/centos-8/Dockerfile
@@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 
 RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
     && source /etc/os-release; \
-     [ "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
     && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
     && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
     && yum update -y) || true)

diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile
@@ -26,6 +26,13 @@ ENV NODE_VERSION 16.16.0
 ENV YARN_VERSION 1.22.19
 ENV GCC_VERSION 10
 
+RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
+    && source /etc/os-release; \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+    && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
+    && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
+    && yum update -y) || true)
+
 # rpm on centos 7 iterates over all fds up to the limit, which is
 # extremely slow. Force it to be small.
 RUN ulimit -n 1024 \

diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile
@@ -26,6 +26,13 @@ ENV NODE_VERSION 16.16.0
 ENV YARN_VERSION 1.22.19
 ENV GCC_VERSION 11
 
+RUN (echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
+    && source /etc/os-release; \
+     [ "$VERSION" = "7" || "$VERSION" = "8" ] && (cd /etc/yum.repos.d/ \
+    && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
+    && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
+    && yum update -y) || true)
+
 # rpm on centos 7 iterates over all fds up to the limit, which is
 # extremely slow. Force it to be small.
 RUN ulimit -n 1024 \