summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Dave Hello <hsu@peterdavehello.org>2018-11-20 15:13:58 +0800
committerPeter Dave Hello <hsu@peterdavehello.org>2022-10-04 01:17:16 +0800
commit4c58ea8d2eaa4587a9641e61da2f20f6f0a98211 (patch)
tree134de1153580aed6aa9f2f663938959408d69a81
parentb26d042f076342e595ad7b3f1edcb9b3ca0363fa (diff)
downloaddistcc-git-4c58ea8d2eaa4587a9641e61da2f20f6f0a98211.tar.gz
Add `-y` to apt-get in Dockerfile to avoid manual input
-rw-r--r--docker/base/Dockerfile12
-rw-r--r--docker/compilers/Dockerfile.clang-3.82
-rw-r--r--docker/compilers/Dockerfile.gcc-4.88
-rw-r--r--docker/compilers/Dockerfile.gcc-58
4 files changed, 15 insertions, 15 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 3fd571f..7779edd 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -7,11 +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 ab286fa..41f3b54 100644
--- a/docker/compilers/Dockerfile.clang-3.8
+++ b/docker/compilers/Dockerfile.clang-3.8
@@ -3,7 +3,7 @@ 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 && \
diff --git a/docker/compilers/Dockerfile.gcc-4.8 b/docker/compilers/Dockerfile.gcc-4.8
index 8c5e0b9..50c0ca9 100644
--- a/docker/compilers/Dockerfile.gcc-4.8
+++ b/docker/compilers/Dockerfile.gcc-4.8
@@ -3,10 +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 1c88c41..f4febe8 100644
--- a/docker/compilers/Dockerfile.gcc-5
+++ b/docker/compilers/Dockerfile.gcc-5
@@ -3,10 +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