diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-04 20:22:41 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-04 20:22:41 +0000 |
| commit | 3b8d64ee24053638aa22f67ced1367c8666b9fa0 (patch) | |
| tree | 8e27b98e897a7111413a7bb6263543bde0a59228 | |
| parent | e72531bfacb2399ad0783a26b1c23f0bba24a107 (diff) | |
| parent | 053b17f57ecd9e1c3f82118e2a5e5c3b2937969d (diff) | |
| download | pleroma-3b8d64ee24053638aa22f67ced1367c8666b9fa0.tar.gz | |
Merge branch 'dockerfile-touchups' into 'develop'
Update Dockerfile + some touchups to docker.exs
See merge request pleroma/pleroma!1624
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | config/docker.exs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 268ec61dc..c61dcfde9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rinpatch/elixir:1.9.0-rc.0-alpine as build +FROM elixir:1.9-alpine as build COPY . . @@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\ mkdir release &&\ mix release --path release -FROM alpine:latest +FROM alpine:3.9 ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma diff --git a/config/docker.exs b/config/docker.exs index 63ab4cdee..f9f27d141 100644 --- a/config/docker.exs +++ b/config/docker.exs @@ -10,7 +10,7 @@ config :pleroma, :instance, notify_email: System.get_env("NOTIFY_EMAIL"), limit: 5000, registrations_open: false, - dynamic_configuration: true + healthcheck: true config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, |