From 69817a4d7f16cbdecff1727685e4e180ffdbb6d9 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Wed, 12 Apr 2023 10:56:11 +0200 Subject: [PATCH] Revert "Add more mirrors" This reverts commit 8bfe02afde3896b9b059d0f90753366fb938947c. It was causing build problems of two kinds 1) These repositories sometimes appear not correctly signed. #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-updates InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy-updates/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-backports InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy-backports/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-security InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy-security/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu-ports/dists/jammy/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy-updates InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu-ports/dists/jammy-updates/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu-ports/dists/jammy-backports/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy-backports InRelease' is not signed. #11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu-ports/dists/jammy-security/InRelease 502 Bad Gateway [IP: 135.181.208.35 443] #11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy-security InRelease' is not signed. 2) These repositories sometimes appear to suffer from concurrency issues. E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy-updates/main/binary-amd64/by-hash/SHA256/e982b491ee116748562a4208918ced995d019a31bef367749e76ba53b86c3e66 File has unexpected size (1245184 != 1255827). Mirror sync in progress? [IP: 86.106.183.57 443] (cherry picked from commit 13e1819c676c26895b23248004c5b0cebce274f6) --- core/docker/Dockerfile | 8 -------- core/docker/build.sh | 6 +----- .../default/apt/sources.list.d/mirrors-amd64.sources | 6 ------ .../default/apt/sources.list.d/mirrors-arm64.sources | 6 ------ .../default/apt/sources.list.d/mirrors-ppc64le.sources | 7 ------- 5 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 core/docker/default/apt/sources.list.d/mirrors-amd64.sources delete mode 100644 core/docker/default/apt/sources.list.d/mirrors-arm64.sources delete mode 100644 core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources diff --git a/core/docker/Dockerfile b/core/docker/Dockerfile index 16947114a48ad..ec91f1094a725 100644 --- a/core/docker/Dockerfile +++ b/core/docker/Dockerfile @@ -13,12 +13,8 @@ # FROM eclipse-temurin:17-jdk AS builder -COPY default/apt/sources.list.d /etc/apt/sources.list.d - RUN \ set -xeu && \ - . /etc/os-release && \ - sed -i "s/\${UBUNTU_CODENAME}/${UBUNTU_CODENAME}/g" /etc/apt/sources.list.d/* && \ echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ echo 'Acquire::http::Timeout "15";' > /etc/apt/apt.conf.d/80-timeouts && \ apt-get update -q && \ @@ -28,12 +24,8 @@ RUN \ FROM eclipse-temurin:17-jdk -COPY default/apt/sources.list.d /etc/apt/sources.list.d - RUN \ set -xeu && \ - . /etc/os-release && \ - sed -i "s/\${UBUNTU_CODENAME}/${UBUNTU_CODENAME}/g" /etc/apt/sources.list.d/* && \ echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ echo 'Acquire::http::Timeout "15";' > /etc/apt/apt.conf.d/80-timeouts && \ apt-get update -q && \ diff --git a/core/docker/build.sh b/core/docker/build.sh index 0e11502e762c9..99b93a33bbc13 100755 --- a/core/docker/build.sh +++ b/core/docker/build.sh @@ -65,15 +65,12 @@ 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}" -mkdir -p "${WORK_DIR}/default" -cp -R default/etc "${WORK_DIR}/default/" +cp -R default "${WORK_DIR}/" 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 \ @@ -81,7 +78,6 @@ for arch in "${ARCHITECTURES[@]}"; do -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 deleted file mode 100644 index 9fd0eeef70528..0000000000000 --- a/core/docker/default/apt/sources.list.d/mirrors-amd64.sources +++ /dev/null @@ -1,6 +0,0 @@ -Enabled: yes -Types: deb -URIs: https://mirrors.ocf.berkeley.edu/ubuntu/ https://mirror.kumi.systems/ubuntu/ -Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-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 deleted file mode 100644 index 3f1b0dd9c7f35..0000000000000 --- a/core/docker/default/apt/sources.list.d/mirrors-arm64.sources +++ /dev/null @@ -1,6 +0,0 @@ -Enabled: yes -Types: deb -URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/ -Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-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 deleted file mode 100644 index 4cc866de6b5c4..0000000000000 --- a/core/docker/default/apt/sources.list.d/mirrors-ppc64le.sources +++ /dev/null @@ -1,7 +0,0 @@ -Enabled: yes -Types: deb -URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports/ https://mirror.kumi.systems/ubuntu-ports/ -Suites: ${UBUNTU_CODENAME} ${UBUNTU_CODENAME}-updates ${UBUNTU_CODENAME}-backports ${UBUNTU_CODENAME}-security -Components: main restricted universe multiverse -# This is NOT a typo, Ubuntu calls "little endian" architecture "endian little" -Architectures: ppc64el