From 3d8e01af8af305f6c91e14983bef747f35466d8f Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Mon, 19 Sep 2022 18:04:55 -0700 Subject: [PATCH 1/3] Use Swift 5.7 base image for Swift CI jobs to support bootstrapping --- swift-ci/master/amazon-linux/2/Dockerfile | 2 +- swift-ci/master/centos/7/Dockerfile | 2 +- swift-ci/master/ubuntu/18.04/Dockerfile | 2 +- swift-ci/master/ubuntu/20.04/Dockerfile | 2 +- swift-ci/master/ubuntu/22.04/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/swift-ci/master/amazon-linux/2/Dockerfile b/swift-ci/master/amazon-linux/2/Dockerfile index 5b8932e1..600ba910 100644 --- a/swift-ci/master/amazon-linux/2/Dockerfile +++ b/swift-ci/master/amazon-linux/2/Dockerfile @@ -1,4 +1,4 @@ -FROM amazonlinux:2 +FROM swift:5.7-amazonlinux-2 RUN yum install shadow-utils -y diff --git a/swift-ci/master/centos/7/Dockerfile b/swift-ci/master/centos/7/Dockerfile index da12e1e5..54eaa5e3 100644 --- a/swift-ci/master/centos/7/Dockerfile +++ b/swift-ci/master/centos/7/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM swift:5.7-centos7 RUN yum install shadow-utils.x86_64 -y diff --git a/swift-ci/master/ubuntu/18.04/Dockerfile b/swift-ci/master/ubuntu/18.04/Dockerfile index 611e58b2..a74c29da 100644 --- a/swift-ci/master/ubuntu/18.04/Dockerfile +++ b/swift-ci/master/ubuntu/18.04/Dockerfile @@ -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 diff --git a/swift-ci/master/ubuntu/20.04/Dockerfile b/swift-ci/master/ubuntu/20.04/Dockerfile index fcc25b4a..c65e9325 100644 --- a/swift-ci/master/ubuntu/20.04/Dockerfile +++ b/swift-ci/master/ubuntu/20.04/Dockerfile @@ -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 diff --git a/swift-ci/master/ubuntu/22.04/Dockerfile b/swift-ci/master/ubuntu/22.04/Dockerfile index 7cb1dcf6..21d6b5f9 100644 --- a/swift-ci/master/ubuntu/22.04/Dockerfile +++ b/swift-ci/master/ubuntu/22.04/Dockerfile @@ -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 From 032de1eb646adce959b2bad6441360676283b80c Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Mon, 19 Sep 2022 18:11:38 -0700 Subject: [PATCH 2/3] Fix typo in the Amazon Linux 2 Dockerfile --- swift-ci/master/amazon-linux/2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift-ci/master/amazon-linux/2/Dockerfile b/swift-ci/master/amazon-linux/2/Dockerfile index 600ba910..13775ebe 100644 --- a/swift-ci/master/amazon-linux/2/Dockerfile +++ b/swift-ci/master/amazon-linux/2/Dockerfile @@ -1,4 +1,4 @@ -FROM swift:5.7-amazonlinux-2 +FROM swift:5.7-amazonlinux2 RUN yum install shadow-utils -y From 09979da3f297491243a88a8c10ef6761257c3e92 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Mon, 19 Sep 2022 19:49:21 -0700 Subject: [PATCH 3/3] Update the group for Amazon Linux 2 and CentOS 7 --- swift-ci/master/amazon-linux/2/Dockerfile | 2 +- swift-ci/master/centos/7/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/swift-ci/master/amazon-linux/2/Dockerfile b/swift-ci/master/amazon-linux/2/Dockerfile index 13775ebe..83fc3e0b 100644 --- a/swift-ci/master/amazon-linux/2/Dockerfile +++ b/swift-ci/master/amazon-linux/2/Dockerfile @@ -2,7 +2,7 @@ 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. diff --git a/swift-ci/master/centos/7/Dockerfile b/swift-ci/master/centos/7/Dockerfile index 54eaa5e3..9d125b95 100644 --- a/swift-ci/master/centos/7/Dockerfile +++ b/swift-ci/master/centos/7/Dockerfile @@ -2,7 +2,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