Skip to content

Commit

Permalink
Revert "Add more mirrors"
Browse files Browse the repository at this point in the history
This reverts commit 8bfe02a.

It was causing build problems of two kinds

1) These repositories sometimes appear not correctly signed.

    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy InRelease' is not signed.
    trinodb#11 33.78 E: Failed to fetch https://mirror.kumi.systems/ubuntu/dists/jammy/InRelease  502  Bad Gateway [IP: 135.181.208.35 443]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-updates InRelease' is not signed.
    trinodb#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]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-backports InRelease' is not signed.
    trinodb#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]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu jammy-security InRelease' is not signed.
    trinodb#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]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy InRelease' is not signed.
    trinodb#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]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy-updates InRelease' is not signed.
    trinodb#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]
    trinodb#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]
    trinodb#11 33.78 E: The repository 'https://mirror.kumi.systems/ubuntu-ports jammy-backports InRelease' is not signed.
    trinodb#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]
    trinodb#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 13e1819)
  • Loading branch information
findepi authored and kokosing committed Apr 12, 2023
1 parent 7bca3e3 commit 69817a4
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 32 deletions.
8 changes: 0 additions & 8 deletions core/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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 && \
Expand Down
6 changes: 1 addition & 5 deletions core/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,19 @@ 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 \
--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"
Expand Down
6 changes: 0 additions & 6 deletions core/docker/default/apt/sources.list.d/mirrors-amd64.sources

This file was deleted.

6 changes: 0 additions & 6 deletions core/docker/default/apt/sources.list.d/mirrors-arm64.sources

This file was deleted.

This file was deleted.

0 comments on commit 69817a4

Please sign in to comment.