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

Merge pull request #128 into master

Browse Source 
a9e2976 client: Dockerfiles: optimize by moving useradd (Aaron Fiore)
This commit was merged in pull request #128.
This commit is contained in:
Aaron Fiore
2024-08-21 20:19:42 -07:00
parent b114e0b814 a9e2976748
commit 6d5185b63c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/Dockerfiles/finance/Dockerfile.archlinux.in
View File

@@ -22,9 +22,6 @@ FROM archlinux:base-devel
# System preparation
#
# Add `finance` user
RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
# Add system-level user for building (won't pollute user-level UID space)
RUN useradd -m -s /bin/bash -r builder
RUN gpasswd -a builder wheel
@@ -79,6 +76,10 @@ RUN composer require ccxt/ccxt
# Shell environment
#
# Add `finance` user
USER root
RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
USER @DOCKER_FINANCE_USER@
RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_CONF}/shell/superscript.bash\"" | tee -a ~/.bashrc
RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/completion.bash\"" | tee -a ~/.bashrc

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

@@ -26,9 +26,6 @@ RUN groupadd -r wheel
# 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@
# Add system-level user for building (won't pollute user-level UID space)
RUN useradd -m -s /bin/bash -r builder
RUN gpasswd -a builder wheel
@@ -83,6 +80,9 @@ RUN composer require ccxt/ccxt
# Shell environment
#
# Add `finance` user
RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
USER @DOCKER_FINANCE_USER@
RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_CONF}/shell/superscript.bash\"" | tee -a ~/.bash_aliases
RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/completion.bash\"" | tee -a ~/.bash_aliases