summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile4
-rw-r--r--config/docker.exs2
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,