Skip to content

Use Swift 5.7 base image for Swift CI jobs to support bootstrapping #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions swift-ci/master/amazon-linux/2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM amazonlinux:2
FROM swift:5.7-amazonlinux2

RUN yum install shadow-utils -y

RUN groupadd -g 998 build-user && \
RUN groupadd -g 1000 build-user && \
useradd -m -r -u 42 -g build-user build-user

# The build needs a package from the EPEL repo so that needs to be enabled.
Expand Down
4 changes: 2 additions & 2 deletions swift-ci/master/centos/7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM centos:7
FROM swift:5.7-centos7

RUN yum install shadow-utils.x86_64 -y

RUN groupadd -g 998 build-user && \
RUN groupadd -g 1000 build-user && \
useradd -m -r -u 42 -g build-user build-user

RUN yum install -y epel-release centos-release-scl
Expand Down
2 changes: 1 addition & 1 deletion swift-ci/master/ubuntu/18.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM swift:5.7-bionic

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
Expand Down
2 changes: 1 addition & 1 deletion swift-ci/master/ubuntu/20.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM swift:5.7-focal

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
Expand Down
2 changes: 1 addition & 1 deletion swift-ci/master/ubuntu/22.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM swift:5.7-jammy

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
Expand Down