Users in docker

diff --git a/Dockerfile b/Dockerfile
index 032024b..f916be0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM python:3.8 AS base
 
-ARG UID=1000
-ARG GID=1000
-
 RUN     apt-get update && apt-get install -y \
        git \
        calibre \
@@ -21,9 +18,6 @@ RUN pip install --no-cache-dir \
     django-debug-toolbar==3.2.2 \
     python-bidi
 
-RUN addgroup --gid $GID app
-RUN adduser --gid $GID --home /app --uid $UID app
-
 RUN     apt-get install -y \
        texlive-extra-utils \
        texlive-lang-greek \
@@ -34,10 +28,8 @@ RUN     apt-get install -y \
        fonts-noto-core fonts-noto-extra
 
 
-USER app
-
 # fonts
-RUN cp -a /usr/local/lib/python*/site-packages/librarian/fonts /app/.fonts
+RUN cp -a /usr/local/lib/python*/site-packages/librarian/fonts /usr/local/share/fonts
 RUN fc-cache
 
 WORKDIR /app/src
@@ -46,12 +38,10 @@ WORKDIR /app/src
 FROM base AS dev
 
 #RUN pip install --no-cache-dir coverage
-USER app
 
 
 FROM base AS prod
 
 RUN pip install --no-cache-dir gunicorn
 
-USER app
 COPY src /app/src

diff --git a/Makefile b/Makefile
index 77d345d..2d7d105 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ test:
 
 
 shell:
-       UID=$(UID) GID=$(GID) docker-compose run --rm dev bash
+       UID=$(UID) GID=$(GID) docker compose run --rm dev bash
 
 
 build:
-       UID=$(UID) GID=$(GID) docker-compose build dev
+       docker compose build dev

diff --git a/docker-compose.yml b/docker-compose.yml
index 89b2216..fcc4d35 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,7 @@ services:
     build:
       context: .
       target: dev
-      args:
-        - "UID=${UID}"
-        - "GID=${GID}"
+    user: "${UID}:${GID}"
     volumes:
       - ./src:/app/src
       - ./var/media:/app/var/media

diff --git a/manage b/manage
index 1077a03..b70a319 100755 (executable)
--- a/manage
+++ b/manage
@@ -8,7 +8,7 @@ then
     [ -z "$PORT" ] && PORT=8000
     EXPOSED=127.0.0.1:"$PORT"
     echo "expose as: $EXPOSED"
-    exec docker-compose run --rm -p "$EXPOSED":"$PORT" dev python $PYARGS manage.py runserver 0.0.0.0:"$PORT"
+    exec docker compose run --rm -p "$EXPOSED":"$PORT" dev python $PYARGS manage.py runserver 0.0.0.0:"$PORT"
 else
-    exec docker-compose run --rm dev python $PYARGS manage.py "$@"
+    exec docker compose run --rm dev python $PYARGS manage.py "$@"
 fi