Rename abc user to buildkite

This commit is contained in:
Amir Zarrinkafsh 2019-12-19 01:23:23 +11:00 committed by Clément Michaud
parent 9e7dac1107
commit 8939ca4f65
5 changed files with 11 additions and 11 deletions

View File

@ -54,9 +54,9 @@ RUN \
tar xfz s6-overlay.tar.gz -C / && \ tar xfz s6-overlay.tar.gz -C / && \
echo "**** Patch CVE-2019-5021 ****" && \ echo "**** Patch CVE-2019-5021 ****" && \
sed -i -e 's/^root::/root:!:/' /etc/shadow && \ sed -i -e 's/^root::/root:!:/' /etc/shadow && \
echo "**** Create abc user and make our folders ****" && \ echo "**** Create buildkite user and make our folders ****" && \
useradd -u 911 -U -d /buildkite -s /bin/false abc && \ useradd -u 911 -U -d /buildkite -s /bin/false buildkite && \
usermod -G wheel abc && \ usermod -G wheel buildkite && \
sed -i 's/# %wheel/%wheel/g' /etc/sudoers && \ sed -i 's/# %wheel/%wheel/g' /etc/sudoers && \
echo "**** Install Buildkite ****" && \ echo "**** Install Buildkite ****" && \
mkdir -p /buildkite/builds /buildkite/hooks /buildkite/plugins && \ mkdir -p /buildkite/builds /buildkite/hooks /buildkite/plugins && \

View File

@ -3,8 +3,8 @@
PUID=${PUID:-911} PUID=${PUID:-911}
PGID=${PGID:-911} PGID=${PGID:-911}
groupmod -o -g "$PGID" abc groupmod -o -g "$PGID" buildkite
usermod -o -u "$PUID" abc usermod -o -u "$PUID" buildkite
cat <<'EOF' cat <<'EOF'
-------------------------------------------- --------------------------------------------
@ -22,8 +22,8 @@ GID/UID
-------------------------------------------- --------------------------------------------
EOF EOF
echo " echo "
User uid: $(id -u abc) User uid: $(id -u buildkite)
User gid: $(id -g abc) User gid: $(id -g buildkite)
-------------------------------------------- --------------------------------------------
" "
chown abc:abc /buildkite chown buildkite:buildkite /buildkite

View File

@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# permissions # permissions
chown -R abc:abc \ chown -R buildkite:buildkite \
/buildkite /buildkite

View File

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
exec \ exec \
s6-setuidgid abc ssh-env-config.sh /usr/local/bin/buildkite-agent start s6-setuidgid buildkite ssh-env-config.sh /usr/local/bin/buildkite-agent start

View File

@ -4,5 +4,5 @@ while [ ! -S "/run/docker.sock" ];
do do
sleep 1; sleep 1;
done done
chown root:abc /run/docker.sock chown root:buildkite /run/docker.sock
tail -f /dev/null tail -f /dev/null