logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 3b8d64ee24053638aa22f67ced1367c8666b9fa0
parent: e72531bfacb2399ad0783a26b1c23f0bba24a107
Author: rinpatch <rinpatch@sdf.org>
Date:   Wed,  4 Sep 2019 20:22:41 +0000

Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624

Diffstat:

MDockerfile4++--
Mconfig/docker.exs2+-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 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 @@ -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,