diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile index adaa2b0a..1bc9b3da 100644 --- a/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile +++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile @@ -1,6 +1,10 @@ FROM ubuntu:16.04 ARG COIN_RUNS_IN_QT_COMPANY -# Temp quick fix: Skip repo-clones usage -#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ -# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \ -# || echo "Internal package repository not found. Using public repositories." +RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ + && { printf '%s\n' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \ +> /etc/apt/sources.list; \ + } \ diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile index a16d3983..7f3247f3 100644 --- a/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile +++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile @@ -1,6 +1,10 @@ FROM ubuntu:18.04 ARG COIN_RUNS_IN_QT_COMPANY -# Temp quick fix: Skip repo-clones usage -#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ -# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \ -# || echo "Internal package repository not found. Using public repositories." +RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \ + && { printf '%s\n' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \ + 'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \ +> /etc/apt/sources.list; \ + } \ diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh index c15d9453..f58a74ae 100755 --- a/coin/provisioning/common/unix/common.sourced.sh +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -116,7 +116,7 @@ set_common_environment () { CMD_INSTALL="sudo install" COIN_RUNS_IN_QT_COMPANY=false - if ping -c1 repo-clones.ci.qt.io >/dev/null 2>&1 + if ping -c1 repo-clones-apt.ci.qt.io >/dev/null 2>&1 then COIN_RUNS_IN_QT_COMPANY=true fi