Skip to content

Commit fe9fe55

Browse files
authored
Revert "Use Swift 5.7 base image for Swift CI jobs to support bootstrapping (#314)"
This reverts commit 83ecbcc.
1 parent 83ecbcc commit fe9fe55

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM swift:5.7-amazonlinux2
1+
FROM amazonlinux:2
22

33
RUN yum install shadow-utils -y
44

5-
RUN groupadd -g 1000 build-user && \
5+
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 42 -g build-user build-user
77

88
# The build needs a package from the EPEL repo so that needs to be enabled.

swift-ci/master/centos/7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM swift:5.7-centos7
1+
FROM centos:7
22

33
RUN yum install shadow-utils.x86_64 -y
44

5-
RUN groupadd -g 1000 build-user && \
5+
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 42 -g build-user build-user
77

88
RUN yum install -y epel-release centos-release-scl

swift-ci/master/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:5.7-bionic
1+
FROM ubuntu:18.04
22

33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user

swift-ci/master/ubuntu/20.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:5.7-focal
1+
FROM ubuntu:20.04
22

33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user

swift-ci/master/ubuntu/22.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:5.7-jammy
1+
FROM ubuntu:22.04
22

33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user

0 commit comments

Comments
 (0)