diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2018-09-08 21:30:53 +0100 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2018-09-08 21:31:02 +0100 |
| commit | 31f31d7466481e654159e08ef6bea894c37a2ab1 (patch) | |
| tree | c3a42692a5b5420f776a6ec16696982e19fd4f6d | |
| parent | fe6df7e28d2512f5ebfa047a5cb8b8f780ef3214 (diff) | |
| download | google-fruit-31f31d7466481e654159e08ef6bea894c37a2ab1.tar.gz | |
Add networkx to the dockerfiles.
| -rw-r--r-- | extras/dockerfiles/Dockerfile.ubuntu-17.04 | 3 | ||||
| -rw-r--r-- | extras/dockerfiles/common_install.sh | 2 | ||||
| -rw-r--r-- | extras/dockerfiles/ubuntu-17.10_install.sh | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-17.04 b/extras/dockerfiles/Dockerfile.ubuntu-17.04 index 6718523..ee50dcc 100644 --- a/extras/dockerfiles/Dockerfile.ubuntu-17.04 +++ b/extras/dockerfiles/Dockerfile.ubuntu-17.04 @@ -4,6 +4,7 @@ MAINTAINER Marco Poletti <poletti.marco@gmail.com> COPY ubuntu-17.04_custom.list /etc/apt/sources.list.d/ COPY common_install.sh common_cleanup.sh ubuntu-17.04_install.sh / -RUN bash -x /common_install.sh && \ +RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list; \ + bash -x /common_install.sh && \ bash -x /ubuntu-17.04_install.sh && \ bash -x /common_cleanup.sh diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh index 8f32478..154ffd5 100644 --- a/extras/dockerfiles/common_install.sh +++ b/extras/dockerfiles/common_install.sh @@ -27,9 +27,9 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \ libc++-dev \ python3-pip \ python3-setuptools \ + python3-networkx \ dirmngr -pip3 install --upgrade pip pip3 install wheel pip3 install pytest pip3 install pytest-xdist diff --git a/extras/dockerfiles/ubuntu-17.10_install.sh b/extras/dockerfiles/ubuntu-17.10_install.sh index 36fd97e..f04ce6e 100644 --- a/extras/dockerfiles/ubuntu-17.10_install.sh +++ b/extras/dockerfiles/ubuntu-17.10_install.sh @@ -6,6 +6,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F apt-get install -y --allow-unauthenticated --no-install-recommends \ g++-7 \ + clang-5.0 \ python \ python3-sh \ python3-typed-ast \ |