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

docker: parametrize postgis image in docker compose #6140

Merged
merged 1 commit into from
Dec 15, 2023
Merged

docker: parametrize postgis image in docker compose #6140

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ volumes:

services:
postgres:
image: postgis/postgis:15-3.4-alpine
image: ${OSRD_POSTGIS_IMAGE:-postgis/postgis:15-3.4-alpine}
container_name: osrd-postgres
user: postgres
restart: unless-stopped
Expand Down
10 changes: 10 additions & 0 deletions editoast/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ rustup component add rustfmt clippy

To setup `grcov`, please see [its documentation](/~https://github.com/mozilla/grcov#how-to-get-grcov)

## For M1 MacOS users

Our `docker-compose.yml` at the root of the project uses the `postgis` image by default.
For M1 macs, it requires emulation since it's not compiled for arm platforms, which results
in a significant slowdown. Define this variable in your environment or in a `.env` file somewhere:

```sh
export OSRD_POSTGIS_IMAGE='nickblah/postgis:15-postgis-3'
```

## OpenApi generation

We have to keep the OpenApi of the service statically in the repository.
Expand Down
Loading