From 5fbf06b1b40832910b9ab9d7790e8cf466916b2c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Aug 2025 21:49:49 +0000 Subject: [PATCH] feat(dockerfiles): remove ubuntu user from 24.04 docker image * Removed `ARG PUID` and `ARG PGID` from Dockerfiles for Ubuntu 20.04, 22.04, and 24.04. * Added a step to remove the default `ubuntu` user in Dockerfile for Ubuntu 24.04. --- Dockerfile.ubuntu-2004 | 2 -- Dockerfile.ubuntu-2204 | 2 -- Dockerfile.ubuntu-2404 | 5 +++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index 4642684..42a704e 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -1,8 +1,6 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive -ARG PUID=1000 -ARG PGID=1000 ARG BUILD_DATE ARG VCS_REF diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index ee5eaad..695acc1 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -1,8 +1,6 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive -ARG PUID=1000 -ARG PGID=1000 ARG BUILD_DATE ARG VCS_REF diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404 index 26bbfbb..92b94bb 100644 --- a/Dockerfile.ubuntu-2404 +++ b/Dockerfile.ubuntu-2404 @@ -1,8 +1,9 @@ FROM ubuntu:24.04 +## Remove ubuntu user added in 24.04 by default +RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu + ARG DEBIAN_FRONTEND=noninteractive -ARG PUID=1000 -ARG PGID=1000 ARG BUILD_DATE ARG VCS_REF