diff --git a/.orchestra/ci/Dockerfile b/.orchestra/ci/Dockerfile index 95486b2a..b7610728 100644 --- a/.orchestra/ci/Dockerfile +++ b/.orchestra/ci/Dockerfile @@ -1,8 +1,10 @@ FROM ubuntu:22.04 +COPY sources.list /etc/apt/sources.list +COPY sources.list.hetzner /etc/apt/sources.list.hetzner + COPY install-dependencies.sh \ install-system-dependencies.sh \ - install-node-dependencies.sh \ / RUN /install-dependencies.sh \ diff --git a/.orchestra/ci/ci.sh b/.orchestra/ci/ci.sh index e2047296..7a73f075 100755 --- a/.orchestra/ci/ci.sh +++ b/.orchestra/ci/ci.sh @@ -131,6 +131,14 @@ echo -e "$BOLD" echo "################################################################################" echo -e "$RESET" +if ping -c 1 -W 1 mirror.hetzner.com >/dev/null 2>&1; then + log "Selecting Hetzner APT mirror" + mv /etc/apt/sources.list.hetzner /etc/apt/sources.list +else + log "Not running on Hetzner, using preconfigured APT mirror" +fi + +log "Updating system dependencies..." # Install missing dependencies .orchestra/ci/install-dependencies.sh diff --git a/.orchestra/ci/install-system-dependencies.sh b/.orchestra/ci/install-system-dependencies.sh index 0e1afeb5..889b41a7 100755 --- a/.orchestra/ci/install-system-dependencies.sh +++ b/.orchestra/ci/install-system-dependencies.sh @@ -27,6 +27,7 @@ PACKAGES+=(python3) PACKAGES+=(python3-pip) PACKAGES+=(python3-setuptools) PACKAGES+=(gawk) +PACKAGES+=(inetutils-ping) PACKAGES+=(jq) PACKAGES+=(rsync) PACKAGES+=(sed) diff --git a/.orchestra/ci/sources.list b/.orchestra/ci/sources.list new file mode 100644 index 00000000..8fde5b6d --- /dev/null +++ b/.orchestra/ci/sources.list @@ -0,0 +1,11 @@ +deb https://mirror.23m.com/ubuntu/ jammy main restricted +deb https://mirror.23m.com/ubuntu/ jammy-updates main restricted +deb https://mirror.23m.com/ubuntu/ jammy universe +deb https://mirror.23m.com/ubuntu/ jammy-updates universe +deb https://mirror.23m.com/ubuntu/ jammy multiverse +deb https://mirror.23m.com/ubuntu/ jammy-updates multiverse +deb https://mirror.23m.com/ubuntu/ jammy-backports main restricted universe multiverse +deb https://mirror.23m.com/ubuntu/ jammy-security main restricted +deb https://mirror.23m.com/ubuntu/ jammy-security universe +deb https://mirror.23m.com/ubuntu/ jammy-security multiverse + diff --git a/.orchestra/ci/sources.list.hetzner b/.orchestra/ci/sources.list.hetzner new file mode 100644 index 00000000..d150dfe8 --- /dev/null +++ b/.orchestra/ci/sources.list.hetzner @@ -0,0 +1,11 @@ +deb https://mirror.hetzner.com/ubuntu/packages jammy main restricted +deb https://mirror.hetzner.com/ubuntu/packages jammy-updates main restricted +deb https://mirror.hetzner.com/ubuntu/packages jammy universe +deb https://mirror.hetzner.com/ubuntu/packages jammy-updates universe +deb https://mirror.hetzner.com/ubuntu/packages jammy multiverse +deb https://mirror.hetzner.com/ubuntu/packages jammy-updates multiverse +deb https://mirror.hetzner.com/ubuntu/packages jammy-backports main restricted universe multiverse +deb https://mirror.hetzner.com/ubuntu/security jammy-security main restricted +deb https://mirror.hetzner.com/ubuntu/security jammy-security universe +deb https://mirror.hetzner.com/ubuntu/security jammy-security multiverse +