From 558055d1990548b9035a0000f1483746a4ea58c7 Mon Sep 17 00:00:00 2001 From: Matteo Di Carlo <matteo.dicarlo@inaf.it> Date: Fri, 13 Sep 2019 06:47:08 -0400 Subject: [PATCH] tar in nexus --- docker/tango/tango-cpp/Dockerfile | 2 +- docker/tango/tango-db/Dockerfile | 2 +- docker/tango/tango-java/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/tango/tango-cpp/Dockerfile b/docker/tango/tango-cpp/Dockerfile index 62172860..a8705b51 100644 --- a/docker/tango/tango-cpp/Dockerfile +++ b/docker/tango/tango-cpp/Dockerfile @@ -7,7 +7,7 @@ ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_HOST FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv -RUN TANGO_DOWNLOAD_URL=https://github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2/tango-9.3.3-rc2.tar.gz \ +RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz \ # Speed up image builds by adding apt proxy if detected on host && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \ && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \ diff --git a/docker/tango/tango-db/Dockerfile b/docker/tango/tango-db/Dockerfile index 7d5421ae..cf860462 100644 --- a/docker/tango/tango-db/Dockerfile +++ b/docker/tango/tango-db/Dockerfile @@ -1,6 +1,6 @@ FROM mariadb:10 -ENV TANGO_DOWNLOAD_URL=https://github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2/tango-9.3.3-rc2.tar.gz +ENV TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz RUN buildDeps='curl ca-certificates' \ && DEBIAN_FRONTEND=noninteractive apt-get update \ diff --git a/docker/tango/tango-java/Dockerfile b/docker/tango/tango-java/Dockerfile index b7664c4f..080a7eb9 100644 --- a/docker/tango/tango-java/Dockerfile +++ b/docker/tango/tango-java/Dockerfile @@ -19,7 +19,7 @@ RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jr && update-alternatives --set java /usr/java/jre1.8.0_221/bin/java \ && rm /usr/java/java.tar.gz -RUN TANGO_DOWNLOAD_URL=https://github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2/tango-9.3.3-rc2.tar.gz \ +RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz \ && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \ && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \ && echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host" \ -- GitLab