chore: fix docker compose files for macos

diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml
index 44bc3ec0ac7c43cdd7073b336905436bcd461f57..25cf8ff70f98b88510b630da7e9b6672bb8c21ba 100644 (file)
--- a/docker-compose-pg.yml
+++ b/docker-compose-pg.yml
@@ -9,6 +9,7 @@ services:
       - POSTGRES_USER=patchwork
       - POSTGRES_PASSWORD=password
   web:
+    platform: linux/amd64
     build:
       context: .
       dockerfile: ./tools/docker/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 73f080a493ceb7ef2962cb11aabd78f4589a703d..61c61865f8d8c826fd34de29337a4e910666a45c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       # https://stackoverflow.com/a/55706057
       - SYS_NICE  # CAP_SYS_NICE
   web:
+    platform: linux/amd64
     build:
       context: .
       dockerfile: ./tools/docker/Dockerfile

diff --git a/docs/development/installation.rst b/docs/development/installation.rst
index c33f768b15e661191c1dd778f17e786dc725360c..521df51ef849332f949932279d40fd3a6621e0ae 100644 (file)
--- a/docs/development/installation.rst
+++ b/docs/development/installation.rst
@@ -30,6 +30,10 @@ configure Patchwork using Docker:
         package.
   __ post-install_
 
+  .. note::
+
+      Mac users might need to enable Rosetta emulation in the docker engine.
+
 #. (Optional) Create a ``.env`` file in the root directory of the project and
    store your ``UID`` and ``GID`` attribute there.
 

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 0a55b54dbebf4ead2b8e14316122e74ddb59d579..6d942492ee64e498db8071f89058b107cd22450f 100644 (file)
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -9,7 +9,7 @@ ENV PYTHONUNBUFFERED 1
 ENV PROJECT_HOME /home/patchwork/patchwork
 ENV DJANGO_SETTINGS_MODULE patchwork.settings.dev
 
-RUN groupadd --gid=$GID patchwork && \
+RUN groupadd -o --gid=$GID patchwork && \
     useradd --uid=$UID --gid=$GID --create-home patchwork
 RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime