Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624

diff --git a/Dockerfile b/Dockerfile
index 268ec61dc27ba3cbe977831cfce2070d0f6743bb..c61dcfde91251915289159b6663fe51b944c2bd9 100644 (file)
--- 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 63ab4cdeefebe3d8756bf09f8f9e5f15ba815a1c..f9f27d141511ea8c3836a880869c38c670953075 100644 (file)
--- 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,