Skip to content

Commit d58282b

Browse files
authored
Merge pull request #194 from apple/fix-dockerfiles-yum-update
Update the Dockerfile from using apt-get update and yum update to mee…
2 parents f0936ac + 67df613 commit d58282b

File tree

11 files changed

+11
-14
lines changed

11 files changed

+11
-14
lines changed

5.2/amazonlinux/2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM amazonlinux:2
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

5-
RUN yum -y update && yum -y install \
5+
RUN yum -y install \
66
binutils \
77
gcc \
88
git \

5.2/amazonlinux/2/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN set -e; \
2929
&& gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
3030
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
3131
# - Unpack the toolchain, set libs permissions, and clean up.
32-
&& yum -y update && yum -y install tar gzip \
32+
&& yum -y install tar gzip \
3333
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
3434
&& chmod -R o+r /usr/lib/swift \
3535
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \

5.2/centos/7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM centos:7
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

5-
RUN yum -y update && yum install shadow-utils.x86_64 -y \
5+
RUN yum install shadow-utils.x86_64 -y \
66
binutils \
77
gcc \
88
git \

5.2/centos/8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LABEL description="Docker Container for the Swift programming language"
44

55
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
66

7-
RUN yum -y update && yum install --enablerepo=PowerTools -y \
7+
RUN yum install --enablerepo=PowerTools -y \
88
binutils \
99
gcc \
1010
git \

nightly-master/amazonlinux/2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM amazonlinux:2
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

5-
RUN yum -y update && yum -y install \
5+
RUN yum -y install \
66
binutils \
77
gcc \
88
git \

nightly-master/amazonlinux/2/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN set -e; \
3434
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
3535
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
3636
# - Unpack the toolchain, set libs permissions, and clean up.
37-
&& yum -y update && yum -y install tar gzip \
37+
&& yum -y install tar gzip \
3838
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \
3939
&& chmod -R o+r /usr/lib/swift \
4040
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \

nightly-master/centos/7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM centos:7
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

5-
RUN yum -y update && yum install shadow-utils.x86_64 -y \
5+
RUN yum install shadow-utils.x86_64 -y \
66
binutils \
77
gcc \
88
git \

nightly-master/centos/8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LABEL description="Docker Container for the Swift programming language"
44

55
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
66

7-
RUN yum -y update && yum install --enablerepo=PowerTools -y \
7+
RUN yum install --enablerepo=PowerTools -y \
88
binutils \
99
gcc \
1010
git \

swift-ci/master/amazon-linux/2/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM amazonlinux:2
22

3-
RUN yum -y update && yum install shadow-utils.x86_64 -y
3+
RUN yum install shadow-utils.x86_64 -y
44

55
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 42 -g build-user build-user
@@ -10,7 +10,6 @@ RUN groupadd -g 998 build-user && \
1010
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
1111

1212
# Update and install needed build packages
13-
RUN yum -y update
1413
RUN yum -y group install "development tools"
1514
RUN yum -y install \
1615
clang \

swift-ci/master/centos/7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM centos:7
22

3-
RUN yum -y update && yum install shadow-utils.x86_64 -y
3+
RUN yum install shadow-utils.x86_64 -y
44

55
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 42 -g build-user build-user
@@ -48,4 +48,4 @@ WORKDIR /home/build-user
4848

4949
ENV LC_ALL en_US.UTF-8
5050
ENV LANG en_US.UTF-8
51-
ENV LANGUAGE en_US.UTF-8
51+
ENV LANGUAGE en_US.UTF-8

0 commit comments

Comments
 (0)