Skip to content

Commit c7f25d7

Browse files
committed
Create the user first to get the expected uid
1 parent b2ccd49 commit c7f25d7

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Diff for: docker/domserver/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"
33

44
ENV DEBIAN_FRONTEND=noninteractive
55

6+
# Set up user
7+
RUN useradd -m domjudge
8+
69
# Install required packages for build of domserver
710
RUN apt-get update \
811
&& apt-get install --no-install-recommends --no-install-suggests -y \
@@ -22,9 +25,6 @@ RUN apt-get update \
2225
# Use venv to install latest Sphinx. 6.1.0 or higher is required to build DOMjudge docs.
2326
RUN python3 -m venv /venv && . /venv/bin/activate && pip3 install sphinx sphinx-rtd-theme rst2pdf
2427

25-
# Set up user
26-
RUN useradd -m domjudge
27-
2828
# Install composer
2929
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
3030
&& php composer-setup.php \
@@ -51,6 +51,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
5151
FPM_MAX_CHILDREN=40 \
5252
DJ_DB_INSTALL_BARE=0
5353

54+
# Set up user
55+
RUN useradd -m domjudge
56+
5457
# Install required packages for running of domserver
5558
RUN apt-get update \
5659
&& apt-get install --no-install-recommends --no-install-suggests -y \

Diff for: docker/judgehost/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
1010
DOMJUDGE_CREATE_WRITABLE_TEMP_DIR=0 \
1111
RUN_USER_UID_GID=62860
1212

13+
# Set up user
14+
RUN useradd -m domjudge
15+
1316
# Install required packages for running of judgehost
1417
RUN apt-get update \
1518
&& apt-get install --no-install-recommends --no-install-suggests -y \

Diff for: docker/judgehost/Dockerfile.build

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"
33

44
ENV DEBIAN_FRONTEND=noninteractive
55

6+
# Set up user
7+
RUN useradd -m domjudge
8+
69
# Install required packages for build of judgehost
710
RUN apt-get update \
811
&& apt-get install --no-install-recommends --no-install-suggests -y \
@@ -16,11 +19,7 @@ RUN apt-get update \
1619
ca-certificates \
1720
&& rm -rf /var/lib/apt/lists/*
1821

19-
# Set up user
20-
RUN useradd -m domjudge
21-
2222
# Install composer
23-
2423
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
2524
&& php composer-setup.php \
2625
&& mv /composer.phar /usr/local/bin/composer

0 commit comments

Comments
 (0)