diff --git a/.docker/alpine b/.docker/alpine index 390552f..361d285 100644 --- a/.docker/alpine +++ b/.docker/alpine @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-desktop b/.docker/alpine-desktop index b512f66..2d63a6a 100644 --- a/.docker/alpine-desktop +++ b/.docker/alpine-desktop @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-desktopbase b/.docker/alpine-desktopbase index c86df99..4757ef2 100644 --- a/.docker/alpine-desktopbase +++ b/.docker/alpine-desktopbase @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-go b/.docker/alpine-go index 23c25b3..6a5cd3a 100644 --- a/.docker/alpine-go +++ b/.docker/alpine-go @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-pwn b/.docker/alpine-pwn index d7dc437..9676786 100644 --- a/.docker/alpine-pwn +++ b/.docker/alpine-pwn @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-rust b/.docker/alpine-rust index 4b7cc76..64a9296 100644 --- a/.docker/alpine-rust +++ b/.docker/alpine-rust @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo tzdata zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/alpine-slim b/.docker/alpine-slim index 08dd36f..06e4e6a 100644 --- a/.docker/alpine-slim +++ b/.docker/alpine-slim @@ -4,7 +4,7 @@ RUN echo hosts: dns files > /etc/nsswitch.conf RUN apk add --no-cache --update \ sudo zsh -RUN adduser -s /bin/zsh -D ambrose \ +RUN adduser -s /bin/zsh -D ambrose -u 1000 \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/debian b/.docker/debian index 8d53300..8ebe122 100644 --- a/.docker/debian +++ b/.docker/debian @@ -5,7 +5,7 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/debian-desktop b/.docker/debian-desktop index de25a5e..8ed79f0 100644 --- a/.docker/debian-desktop +++ b/.docker/debian-desktop @@ -8,7 +8,7 @@ RUN apt-get update \ # Requires contrib source RUN echo 'deb http://deb.debian.org/debian unstable contrib' >> /etc/apt/sources.list -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/debian-node b/.docker/debian-node index 51624e9..7946025 100644 --- a/.docker/debian-node +++ b/.docker/debian-node @@ -5,7 +5,8 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose -u 1000 -g 1000 \ +RUN userdel --remove node \ + && useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora b/.docker/fedora index bbcc3b3..83e7f3e 100644 --- a/.docker/fedora +++ b/.docker/fedora @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora-desktop b/.docker/fedora-desktop index 3b821a4..be94b43 100644 --- a/.docker/fedora-desktop +++ b/.docker/fedora-desktop @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora-desktopbase b/.docker/fedora-desktopbase index 17c322f..45ac1d6 100644 --- a/.docker/fedora-desktopbase +++ b/.docker/fedora-desktopbase @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora-go b/.docker/fedora-go index 62be421..e9f266d 100644 --- a/.docker/fedora-go +++ b/.docker/fedora-go @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora-pwn b/.docker/fedora-pwn index a981278..0ce5cc6 100644 --- a/.docker/fedora-pwn +++ b/.docker/fedora-pwn @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/fedora-rust b/.docker/fedora-rust index 29110f2..f3e9619 100644 --- a/.docker/fedora-rust +++ b/.docker/fedora-rust @@ -5,7 +5,7 @@ RUN dnf install -y \ && dnf clean all \ && rm -rrf /var/cache/dnf -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/ubuntu b/.docker/ubuntu index ff87ee0..444e7a7 100644 --- a/.docker/ubuntu +++ b/.docker/ubuntu @@ -5,7 +5,7 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/ubuntu-desktop b/.docker/ubuntu-desktop index 5a3bba4..886280c 100644 --- a/.docker/ubuntu-desktop +++ b/.docker/ubuntu-desktop @@ -5,7 +5,7 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/ubuntu-desktopbase b/.docker/ubuntu-desktopbase index f8ea741..63b18d1 100644 --- a/.docker/ubuntu-desktopbase +++ b/.docker/ubuntu-desktopbase @@ -5,7 +5,7 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/.docker/ubuntu-pwn b/.docker/ubuntu-pwn index fc8eae4..deb5592 100644 --- a/.docker/ubuntu-pwn +++ b/.docker/ubuntu-pwn @@ -5,7 +5,7 @@ RUN apt-get update \ sudo zsh \ && rm -rf /var/lib/apt/lists/* -RUN useradd -s /bin/zsh ambrose \ +RUN useradd -s /bin/zsh ambrose -u 1000 -U \ && echo '' >> /etc/sudoers \ && echo '## No password sudo' >> /etc/sudoers \ && echo 'ambrose ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers