Skip to content

Commit 930a836

Browse files
committed
Reduce verbosity some more (and speed up build as well)
1 parent c2bdc6f commit 930a836

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

src/docker/Dockerfile

+13-13
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ ENV PATH=${MAVEN_HOME}/bin:${PATH}
2626
RUN apt-get update && apt-get -y -qq install software-properties-common \
2727
&& add-apt-repository ppa:openjdk-r/ppa && apt-get update \
2828
&& apt-get -y -qq install openjdk-8-jdk \
29-
&& apt-get -y -qq install build-essential \
30-
&& apt-get -y -qq install libssl-dev \
31-
&& apt-get -y -qq install gcc-aarch64-linux-gnu \
32-
&& apt-get -y -qq install g++-aarch64-linux-gnu \
33-
&& apt-get -y -qq install gcc-riscv64-linux-gnu \
34-
&& apt-get -y -qq install g++-riscv64-linux-gnu \
35-
&& apt-get -y -qq install mingw-w64 \
36-
&& apt-get -y -qq install curl -L \
37-
&& apt-get -y -qq install dos2unix \
29+
build-essential \
30+
libssl-dev \
31+
gcc-aarch64-linux-gnu \
32+
g++-aarch64-linux-gnu \
33+
gcc-riscv64-linux-gnu \
34+
g++-riscv64-linux-gnu \
35+
mingw-w64 \
36+
curl -L \
37+
dos2unix \
3838
# Bug workaround see https://github.com/docker-library/openjdk/issues/19.
3939
&& /var/lib/dpkg/info/ca-certificates-java.postinst configure
4040

4141
# Install 32-bit dependencies and tooling.
4242
RUN dpkg --add-architecture i386 && apt-get update \
4343
&& apt-get -y -qq install libssl-dev:i386 \
44-
&& apt-get -y -qq install gcc-arm-linux-gnueabi \
45-
&& apt-get -y -qq install g++-arm-linux-gnueabi \
46-
&& apt-get -y -qq install gcc-arm-linux-gnueabihf \
47-
&& apt-get -y -qq install g++-arm-linux-gnueabihf
44+
gcc-arm-linux-gnueabi \
45+
g++-arm-linux-gnueabi \
46+
gcc-arm-linux-gnueabihf \
47+
g++-arm-linux-gnueabihf
4848

4949
# Do this separately to make upgrades easier
5050
RUN curl -L https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \

src/docker/Dockerfile.aarch64

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ ENV PATH=${MAVEN_HOME}/bin:${PATH}
2626
RUN apt-get update && apt-get -y -qq install software-properties-common \
2727
&& add-apt-repository ppa:openjdk-r/ppa && apt-get update \
2828
&& apt-get -y -qq install openjdk-21-jdk \
29-
&& apt-get -y -qq install libssl-dev \
30-
&& apt-get -y -qq install curl \
29+
libssl-dev \
30+
curl \
3131
# Bug workaround see https://github.com/docker-library/openjdk/issues/19.
3232
&& /var/lib/dpkg/info/ca-certificates-java.postinst configure
3333

src/docker/Dockerfile.riscv64

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ ENV PATH=${MAVEN_HOME}/bin:${PATH}
2626
RUN apt-get update && apt-get -y -qq install software-properties-common \
2727
&& add-apt-repository ppa:openjdk-r/ppa && apt-get update \
2828
&& apt-get -y -qq install openjdk-21-jdk \
29-
&& apt-get -y -qq install libssl-dev \
30-
&& apt-get -y -qq install curl \
29+
libssl-dev \
30+
curl \
3131
# Bug workaround see https://github.com/docker-library/openjdk/issues/19.
3232
&& /var/lib/dpkg/info/ca-certificates-java.postinst configure
3333

0 commit comments

Comments
 (0)