From e6d0ffec7c8849390f9d00d90079af3294bc2141 Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Fri, 13 Sep 2019 13:48:13 -0400
Subject: [PATCH] ST-260 tango 9.3.3 add distutils
---
.gitlab-ci.yml | 1 -
docker/tango/ska-python-buildenv/Dockerfile | 3 ++-
docker/tango/ska-python-runtime/Dockerfile | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 188ec442..aeafdbd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -192,7 +192,6 @@ test-framework-tango-itango:
tags:
- shell
script:
- - apt install python3-distutils
- mkdir .public
- make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USERNAME DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango build
- make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USERNAME DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango test | tee .public/result.txt
diff --git a/docker/tango/ska-python-buildenv/Dockerfile b/docker/tango/ska-python-buildenv/Dockerfile
index ad70dd4c..50c32402 100644
--- a/docker/tango/ska-python-buildenv/Dockerfile
+++ b/docker/tango/ska-python-buildenv/Dockerfile
@@ -28,7 +28,8 @@ RUN DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" subs
RUN buildDeps='build-essential \
libboost-python-dev \
pkg-config \
- virtualenv' \
+ virtualenv \
+ python3-distutils' \
&& DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get -y install --no-install-recommends $buildDeps
diff --git a/docker/tango/ska-python-runtime/Dockerfile b/docker/tango/ska-python-runtime/Dockerfile
index 7aff38d1..c1aad663 100644
--- a/docker/tango/ska-python-runtime/Dockerfile
+++ b/docker/tango/ska-python-runtime/Dockerfile
@@ -23,7 +23,8 @@ USER root
#
RUN runtimeDeps='libboost-python1.67.0 \
make \
- python3' \
+ python3 \
+ python3-distutils' \
&& 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