Skip to content

Commit a8943a8

Browse files
mp911demp911de
committed
Polishing.
Use && syntax to catch commands that exit with non-success exit codes. See #4116
1 parent dfa1822 commit a8943a8

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎ci/openjdk11-mongodb-4.4/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
16-
echo ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
13+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
14+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo ${TZ} > /etc/timezone
1717

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
18+
RUN apt-get update && \
19+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
20+
apt-get clean && \
21+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk17-mongodb-4.4/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
16-
echo ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
13+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
14+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo ${TZ} > /etc/timezone
1717

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
18+
RUN apt-get update && \
19+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
20+
apt-get clean && \
21+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-4.0/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list; \
16-
echo ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
13+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
14+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 && \
15+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list && \
16+
echo ${TZ} > /etc/timezone
1717

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
18+
RUN apt-get update && \
19+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
20+
apt-get clean && \
21+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-4.4/Dockerfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
16-
echo ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
13+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
14+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo ${TZ} > /etc/timezone
1717

18-
RUN apt-get update ; \
19-
ln -T /bin/true /usr/bin/systemctl ; \
20-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
21-
rm /usr/bin/systemctl ; \
22-
apt-get clean ; \
23-
rm -rf /var/lib/apt/lists/* ;
18+
RUN apt-get update && \
19+
ln -T /bin/true /usr/bin/systemctl && \
20+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
21+
rm /usr/bin/systemctl && \
22+
apt-get clean && \
23+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-5.0/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget ; \
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
13+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
1414
# MongoDB 5.0 release signing key
15-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 ; \
15+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \
1616
# Needed when MongoDB creates a 5.0 folder.
17-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list; \
18-
echo ${TZ} > /etc/timezone;
17+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
18+
echo ${TZ} > /etc/timezone
1919

20-
RUN apt-get update; \
21-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
22-
apt-get clean; \
23-
rm -rf /var/lib/apt/lists/*;
20+
RUN apt-get update && \
21+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
22+
apt-get clean && \
23+
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)