Skip to content

Configurable user IDs #429

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
6 changes: 4 additions & 2 deletions swift-ci/main/amazon-linux/2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ FROM amazonlinux:2

RUN yum install shadow-utils -y

RUN groupadd -g 998 build-user && \
useradd -m -r -u 42 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

# The build needs a package from the EPEL repo so that needs to be enabled.
RUN amazon-linux-extras install epel -y
Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/amazon-linux/2023/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ FROM amazonlinux:2023

RUN yum install shadow-utils -y

RUN groupadd -g 998 build-user && \
useradd -m -r -u 42 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

RUN yum -y group install "development tools"
RUN yum -y install \
Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/debian/10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM debian:10

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/debian/11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM debian:11

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/debian/12/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM debian:12

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/debian/9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM debian:9

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/fedora/39/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM fedora:39

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

RUN yum install -y \
libcurl-devel \
Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/fedora/40/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM fedora:40

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

RUN yum install -y \
libcurl-devel \
Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/ubuntu/18.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:18.04

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/ubuntu/20.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:20.04

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/ubuntu/22.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:22.04

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/main/ubuntu/24.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:24.04

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/sdks/static-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ RUN chmod ugo+x /scripts/*
COPY resources /resources

# Create a user
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

USER build-user

Expand Down
6 changes: 4 additions & 2 deletions swift-ci/swift-docc-render/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ FROM node:14.17.4

ARG SWIFT_DOCC_RENDER_BRANCH=main

RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user
ARG BUILD_USER_ID=998

RUN groupadd -g ${BUILD_USER_ID} build-user && \
useradd -m -r -u ${BUILD_USER_ID} -g build-user build-user

USER build-user

Expand Down
Loading