From 5eaf26187597d66f5172be4e3109d95d75790766 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Wed, 12 Jun 2024 18:22:55 -0700 Subject: [PATCH] Dockerfiles: finance/dev-tools: remove default 'ubuntu' user For Ubuntu-based images, remove upstream-added default 'ubuntu' user as it may conflict with host's given UID/GID during docker-finance build. --- client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in | 5 ++++- client/Dockerfiles/finance/Dockerfile.ubuntu.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in index f1a57f5..99b6226 100644 --- a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in +++ b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in @@ -23,7 +23,10 @@ FROM ubuntu:rolling RUN groupadd -r wheel -# `dev-tools` user +# Remove default `ubuntu` user which may conflict with host user's UID/GID (1000:1000) +RUN userdel -r ubuntu + +# Add `dev-tools` user RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@ RUN gpasswd -a @DOCKER_FINANCE_USER@ wheel diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in index 1f7b76e..45e9aff 100644 --- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in +++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in @@ -23,7 +23,10 @@ FROM ubuntu:rolling RUN groupadd -r wheel -# `finance` user +# Remove default `ubuntu` user which may conflict with host user's UID/GID (1000:1000) +RUN userdel -r ubuntu + +# Add `finance` user RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@ # System-level user for building (won't pollute user-level UID space)