diff options
| author | Martin Pool <mbp@sourcefrog.net> | 2022-10-07 23:11:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 23:11:06 -0700 |
| commit | b15870bdedfff33f68c17555a19fa58fd6cd1f2c (patch) | |
| tree | b34d950b16a76cbc801d74b2965f2fac48264ef3 | |
| parent | 6ffece0f9cfe89e89d47744d461d7b8f9bdbf38e (diff) | |
| parent | 7fb0b4a4a5ab7a7c7d5679c99935c90237c46cf5 (diff) | |
| download | distcc-git-b15870bdedfff33f68c17555a19fa58fd6cd1f2c.tar.gz | |
Merge pull request #315 from PeterDaveHelloKitchen/improve-Dockerfile
Improve Dockerfile
| -rw-r--r-- | docker/base/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/compilers/Dockerfile.clang-3.8 | 3 | ||||
| -rw-r--r-- | docker/compilers/Dockerfile.gcc-4.8 | 9 | ||||
| -rw-r--r-- | docker/compilers/Dockerfile.gcc-5 | 9 |
4 files changed, 21 insertions, 16 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 5e995d8..df664ee 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20170802 +FROM ubuntu:xenial-20210804 LABEL maintainer="" @@ -7,9 +7,11 @@ ENV DEBIAN_FRONTEND=noninteractive COPY apt-conf /etc/apt/apt.conf.d/ RUN apt-get update && \ - apt-get install autoconf \ - python3-dev \ - python-dev \ - libiberty-dev \ - build-essential \ - make + apt-get install -y autoconf \ + python3-dev \ + python-dev \ + libiberty-dev \ + build-essential \ + make \ + && \ + rm -rf /var/lib/apt/lists/* diff --git a/docker/compilers/Dockerfile.clang-3.8 b/docker/compilers/Dockerfile.clang-3.8 index 0c6657c..41f3b54 100644 --- a/docker/compilers/Dockerfile.clang-3.8 +++ b/docker/compilers/Dockerfile.clang-3.8 @@ -3,7 +3,8 @@ FROM distcc/base LABEL maintainer="" RUN apt-get update && \ - apt-get install clang-3.8 build-essential && \ + apt-get install -y clang-3.8 build-essential && \ apt-get remove gcc g++ && \ + rm -rf /var/lib/apt/lists/* && \ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.8 50 && \ update-alternatives --install /usr/bin/cc cc /usr/bin/clang-3.8 50 diff --git a/docker/compilers/Dockerfile.gcc-4.8 b/docker/compilers/Dockerfile.gcc-4.8 index ac227a7..50c0ca9 100644 --- a/docker/compilers/Dockerfile.gcc-4.8 +++ b/docker/compilers/Dockerfile.gcc-4.8 @@ -3,9 +3,10 @@ FROM distcc/base LABEL maintainer="" RUN apt-get update && \ - apt-get install gcc-4.8 \ - gcc-multilib \ - g++-4.8 \ - g++-multilib && \ + apt-get install -y gcc-4.8 \ + gcc-multilib \ + g++-4.8 \ + g++-multilib && \ + rm -rf /var/lib/apt/lists/* && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 && \ update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-4.8 50 diff --git a/docker/compilers/Dockerfile.gcc-5 b/docker/compilers/Dockerfile.gcc-5 index 064ab14..f4febe8 100644 --- a/docker/compilers/Dockerfile.gcc-5 +++ b/docker/compilers/Dockerfile.gcc-5 @@ -3,9 +3,10 @@ FROM distcc/base LABEL maintainer="" RUN apt-get update && \ - apt-get install gcc-5 \ - gcc-multilib \ - g++-5 \ - g++-multilib && \ + apt-get install -y gcc-5 \ + gcc-multilib \ + g++-5 \ + g++-multilib && \ + rm -rf /var/lib/apt/lists/* && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 50 && \ update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-5 50 |