File tree Expand file tree Collapse file tree
ci/docker/os-image-stemcell-builder Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4,6 +4,9 @@ FROM $BASE_IMAGE
44
55LABEL maintainer="cf-bosh@lists.cloudfoundry.org"
66
7+ ARG USER_ID=1000
8+ ARG GROUP_ID=1000
9+
710# BUILD_ARGs
811ARG META4_CLI_URL
912ARG SYFT_CLI_URL
@@ -66,7 +69,15 @@ RUN apt-get update \
6669 xvfb \
6770 && locale-gen ${LANG}
6871
69- RUN echo 'ubuntu ALL=NOPASSWD:ALL' >> /etc/sudoers
72+ # AppArmor's unix-chkpwd profile can block the Rosetta translator under
73+ # docker run --privileged on Apple Silicon; use a distinct helper name so PAM still works.
74+ RUN cp /usr/sbin/unix_chkpwd /usr/sbin/unix_chkpwd_rosetta \
75+ && chmod 4755 /usr/sbin/unix_chkpwd_rosetta \
76+ && ln -sf unix_chkpwd_rosetta /usr/sbin/unix_chkpwd
77+
78+ RUN (id -u ubuntu &>/dev/null || useradd -u ${USER_ID} -g ${GROUP_ID} -m ubuntu) \
79+ && usermod -p '*' ubuntu \
80+ && echo 'ubuntu ALL=NOPASSWD:ALL' >> /etc/sudoers
7081
7182RUN temp_dir="/mnt/tmp" \
7283 && mkdir -p "${temp_dir}" \
You can’t perform that action at this time.
0 commit comments