Skip to content

Commit f798b66

Browse files
committed
build: housekeeping in Dockerfile
1 parent a3b3f50 commit f798b66

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG GROUP_ID=1000
2525
ARG AUX_GROUP_IDS=""
2626

2727
RUN set -Eeuxo pipefail && \
28-
addgroup --gid "${GROUP_ID}" user && \
28+
(addgroup --gid "${GROUP_ID}" user || echo "group ${GROUP_ID} already exists, so not adding it") && \
2929
adduser --disabled-password --gecos "User" --uid "${USER_ID}" --gid "${GROUP_ID}" user && \
3030
echo ${AUX_GROUP_IDS} | xargs -n1 echo | xargs -I% addgroup --gid % group% && \
3131
echo ${AUX_GROUP_IDS} | xargs -n1 echo | xargs -I% usermod --append --groups group% user
@@ -40,21 +40,19 @@ RUN set -Eeuxo pipefail && \
4040
apt-get clean && \
4141
rm -rf /var/lib/apt/lists/*
4242

43-
# prepare version-query for testing
44-
4543
WORKDIR /home/user/version-query
4644

4745
COPY --chown=${USER_ID}:${GROUP_ID} requirements*.txt ./
4846

4947
RUN set -Eeuxo pipefail && \
50-
pip3 install -r requirements_ci.txt
48+
pip3 install --no-cache-dir -r requirements_ci.txt
49+
50+
# prepare version-query for testing
5151

5252
USER user
5353

5454
WORKDIR /home/user
5555

56-
VOLUME ["/home/user/version-query"]
57-
5856
ENV EXAMPLE_PROJECTS_PATH="/home/user"
5957

6058
RUN set -Eeuxo pipefail && \
@@ -74,3 +72,5 @@ RUN set -Eeuxo pipefail && \
7472
pip install jupyter # example package that uses metadata.json
7573

7674
WORKDIR /home/user/version-query
75+
76+
VOLUME ["/home/user/version-query"]

0 commit comments

Comments
 (0)