File tree 4 files changed +13
-1
lines changed
4 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ services:
9
9
- POSTGRES_USER=patchwork
10
10
- POSTGRES_PASSWORD=password
11
11
web :
12
+ platform : linux/amd64
12
13
build :
13
14
context : .
14
15
dockerfile : ./tools/docker/Dockerfile
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ services:
14
14
# https://stackoverflow.com/a/55706057
15
15
- SYS_NICE # CAP_SYS_NICE
16
16
web :
17
+ platform : linux/amd64
17
18
build :
18
19
context : .
19
20
dockerfile : ./tools/docker/Dockerfile
Original file line number Diff line number Diff line change @@ -30,6 +30,10 @@ configure Patchwork using Docker:
30
30
package.
31
31
__ post-install _
32
32
33
+ .. note ::
34
+
35
+ Mac users might need to enable Rosetta emulation in the docker engine.
36
+
33
37
#. (Optional) Create a ``.env `` file in the root directory of the project and
34
38
store your ``UID `` and ``GID `` attribute there.
35
39
@@ -44,6 +48,12 @@ configure Patchwork using Docker:
44
48
45
49
__ https://github.com/docker/compose/issues/2380
46
50
51
+ .. note ::
52
+
53
+ For MacOS users the `staff ` default GID might conflict with already
54
+ existing GID in the docker image, that why the non-unique GID option is
55
+ used in the Dockerfiles
56
+
47
57
#. Build the images. This will download over 200MB from the internet:
48
58
49
59
.. code-block :: shell
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ ENV PYTHONUNBUFFERED 1
9
9
ENV PROJECT_HOME /home/patchwork/patchwork
10
10
ENV DJANGO_SETTINGS_MODULE patchwork.settings.dev
11
11
12
- RUN groupadd --gid=$GID patchwork && \
12
+ RUN groupadd -o - -gid=$GID patchwork && \
13
13
useradd --uid=$UID --gid=$GID --create-home patchwork
14
14
RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime
15
15
You can’t perform that action at this time.
0 commit comments