1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-18 10:59:17 +00:00

Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624
This commit is contained in:
rinpatch 2019-09-04 20:22:41 +00:00
commit 3b8d64ee24
2 changed files with 3 additions and 3 deletions

View file

@ -1,4 +1,4 @@
FROM rinpatch/elixir:1.9.0-rc.0-alpine as build FROM elixir:1.9-alpine as build
COPY . . COPY . .
@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\
mkdir release &&\ mkdir release &&\
mix release --path release mix release --path release
FROM alpine:latest FROM alpine:3.9
ARG HOME=/opt/pleroma ARG HOME=/opt/pleroma
ARG DATA=/var/lib/pleroma ARG DATA=/var/lib/pleroma

View file

@ -10,7 +10,7 @@
notify_email: System.get_env("NOTIFY_EMAIL"), notify_email: System.get_env("NOTIFY_EMAIL"),
limit: 5000, limit: 5000,
registrations_open: false, registrations_open: false,
dynamic_configuration: true healthcheck: true
config :pleroma, Pleroma.Repo, config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres, adapter: Ecto.Adapters.Postgres,