EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

Merge pull request #58 into master

Browse Source 
5eaf261 Dockerfiles: finance/dev-tools: remove default 'ubuntu' user (Aaron Fiore)
958cf11 Dockerfiles: finance/dev-tools: remove timezone mount (Aaron Fiore)
This commit was merged in pull request #58.
This commit is contained in:
Aaron Fiore
2024-06-13 15:22:28 -07:00
parent bc1485b4ca 5eaf261875
commit 3dfb9f73fc
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
View File

@@ -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

1
client/Dockerfiles/dev-tools/docker-compose.yml.dev-tools.in
View File

@@ -30,7 +30,6 @@ services:
- ${DOCKER_FINANCE_CLIENT_REPO}/docker-finance.dox:${DOCKER_FINANCE_CLIENT_REPO}/docker-finance.dox
- ${DOCKER_FINANCE_CLIENT_REPO}/client:${DOCKER_FINANCE_CLIENT_REPO}/client
- ${DOCKER_FINANCE_CLIENT_REPO}/container:${DOCKER_FINANCE_CLIENT_REPO}/container
#- /etc/timezone:/etc/timezone:ro # TODO: will break on Arch hosts
- /etc/localtime:/etc/localtime:ro
environment:
- DOCKER_FINANCE_CLIENT_REPO=${DOCKER_FINANCE_CLIENT_REPO}

5
client/Dockerfiles/finance/Dockerfile.ubuntu.in
View File

@@ -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)

1
client/Dockerfiles/finance/docker-compose.yml.archlinux.in
View File

@@ -31,7 +31,6 @@ services:
- ${DOCKER_FINANCE_CLIENT_SHARED}:${DOCKER_FINANCE_CONTAINER_SHARED}
# Needed for when upstream data is localtime instead of UTC
# NOTE: although TZ can be used within the container, this *should* be more dynamic
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
environment:
- DOCKER_FINANCE_CONTAINER_CMD=${DOCKER_FINANCE_CONTAINER_CMD}

1
client/Dockerfiles/finance/docker-compose.yml.ubuntu.in
View File

@@ -31,7 +31,6 @@ services:
- ${DOCKER_FINANCE_CLIENT_SHARED}:${DOCKER_FINANCE_CONTAINER_SHARED}
# Needed for when upstream data is localtime instead of UTC
# NOTE: although TZ can be used within the container, this should be more dynamic
# TODO: for Ubuntu hosts/containers, mount /etc/timezone (not needed w/ Arch)
- /etc/localtime:/etc/localtime:ro
environment:
- DOCKER_FINANCE_CONTAINER_CMD=${DOCKER_FINANCE_CONTAINER_CMD}