Merge branch 'cedricvanrompay/mobilizon-cedricvanrompay-master-patch-75017'

This commit is contained in:
Thomas Citharel 2020-12-21 10:09:45 +01:00
commit 4b8880bc00
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 4 additions and 5 deletions

View file

@ -1,7 +1,6 @@
FROM bitwalker/alpine-elixir:latest
RUN apk add inotify-tools postgresql-client yarn file
RUN apk add --no-cache make gcc libc-dev argon2 imagemagick
RUN apk add --no-cache inotify-tools postgresql-client yarn file make gcc libc-dev argon2 imagemagick cmake build-base libwebp-tools bash ncurses
RUN mix local.hex --force && mix local.rebar --force

View file

@ -1,10 +1,10 @@
version: '3'
version: "3"
services:
postgres:
container_name: mobilizon_db
restart: unless-stopped
image: mdillon/postgis:11
image: postgis/postgis:13-3.0
environment:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: mobilizon_dev
@ -15,7 +15,7 @@ services:
restart: unless-stopped
build: .
volumes:
- '.:/app'
- ".:/app"
ports:
- "4000:4000"
depends_on: