Add more mirrors

trinodb · Mar 14, 2023 · 89f9d6e · 89f9d6e
1 parent d2130dd
commit 89f9d6e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/core/docker/Dockerfile b/core/docker/Dockerfile
@@ -13,6 +13,8 @@
 #
 FROM eclipse-temurin:17-jdk AS builder
 
+COPY default/apt/sources.list.d /etc/apt/sources.list.d
+
 RUN \
     set -xeu && \
     echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
@@ -24,6 +26,8 @@ RUN \
 
 FROM eclipse-temurin:17-jdk
 
+COPY default/apt/sources.list.d /etc/apt/sources.list.d
+
 RUN \
     set -xeu && \
     echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \

diff --git a/core/docker/build.sh b/core/docker/build.sh
@@ -65,19 +65,23 @@ cp "$trino_client" "${WORK_DIR}/"
 tar -C "${WORK_DIR}" -xzf "${WORK_DIR}/trino-server-${TRINO_VERSION}.tar.gz"
 rm "${WORK_DIR}/trino-server-${TRINO_VERSION}.tar.gz"
 cp -R bin "${WORK_DIR}/trino-server-${TRINO_VERSION}"
-cp -R default "${WORK_DIR}/"
+mkdir -p "${WORK_DIR}/default"
+cp -R default/etc "${WORK_DIR}/default/"
 
 TAG_PREFIX="trino:${TRINO_VERSION}"
 
 for arch in "${ARCHITECTURES[@]}"; do
     echo "🫙  Building the image for $arch"
+    mkdir -p "${WORK_DIR}/default/apt/sources.list.d"
+    cp "default/apt/sources.list.d/mirrors-$arch.sources" "${WORK_DIR}/default/apt/sources.list.d/"
     docker build \
         "${WORK_DIR}" \
         --pull \
         --platform "linux/$arch" \
         -f Dockerfile \
         -t "${TAG_PREFIX}-$arch" \
         --build-arg "TRINO_VERSION=${TRINO_VERSION}"
+    rm -fr "${WORK_DIR}/default/apt/sources.list.d"
 done
 
 echo "🧹 Cleaning up the build context directory"

diff --git a/core/docker/default/apt/sources.list.d/mirrors-amd64.sources b/core/docker/default/apt/sources.list.d/mirrors-amd64.sources
@@ -0,0 +1,6 @@
+Enabled: yes
+Types: deb
+URIs: https://mirrors.ocf.berkeley.edu/ubuntu/ https://mirror.kumi.systems/ubuntu/
+Suites: jammy jammy-updates jammy-backports jammy-security
+Components: main restricted universe multiverse
+Architectures: amd64
diff --git a/core/docker/default/apt/sources.list.d/mirrors-arm64.sources b/core/docker/default/apt/sources.list.d/mirrors-arm64.sources
@@ -0,0 +1,6 @@
+Enabled: yes
+Types: deb
+URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/
+Suites: jammy jammy-updates jammy-backports jammy-security
+Components: main restricted universe multiverse
+Architectures: arm64
diff --git a/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources b/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources
@@ -0,0 +1,7 @@
+Enabled: yes
+Types: deb
+URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/
+Suites: jammy jammy-updates jammy-backports jammy-security
+Components: main restricted universe multiverse
+# This is NOT a typo, Ubuntu calls "little endian" architecture "endian little"
+Architectures: ppc64el