Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix docker compose files for macos #620

Merged
merged 1 commit into from
Mar 10, 2025
+7 −1
Merged

chore: fix docker compose files for macos #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose-pg.yml
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ services:
- POSTGRES_USER=patchwork
- POSTGRES_PASSWORD=password
web:
platform: linux/amd64
build:
context: .
dockerfile: ./tools/docker/Dockerfile
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions docs/development/installation.rst
View file
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 1 addition & 1 deletion tools/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I hadn't seen this PR. I've just removed all of this logic since it's no longer necessary from what I can tell. I'll revert it in favour of this though.

useradd --uid=$UID --gid=$GID --create-home patchwork
RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime