potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'docker-fixes' into 'master'

Browse source 
Docker fixes

See merge request framasoft/mobilizon!881
This commit is contained in:
Thomas Citharel 2021-03-30 13:08:22 +00:00
parent 2b25953707 ef4a1d0b76
commit ea0bd3a8c6
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/docker.exs
View file

@ -5,7 +5,7 @@ import Config
listen_ip = System.get_env("MOBILIZON_INSTANCE_LISTEN_IP", "::") listen_ip = System.get_env("MOBILIZON_INSTANCE_LISTEN_IP", "::")
listen_ip = listen_ip =
case :inet.parse_address(listen_ip) do case listen_ip |> to_charlist() |> :inet.parse_address() do
{:ok, listen_ip} -> listen_ip {:ok, listen_ip} -> listen_ip
_ -> raise "MOBILIZON_INSTANCE_LISTEN_IP does not match the expected IP format." _ -> raise "MOBILIZON_INSTANCE_LISTEN_IP does not match the expected IP format."
end end

2
docker/production/Dockerfile
View file

@ -56,7 +56,7 @@ EXPOSE 4000
ENV MOBILIZON_DOCKER=true ENV MOBILIZON_DOCKER=true
COPY --from=builder --chown=nobody:nobody _build/prod/rel/mobilizon ./ COPY --from=builder --chown=nobody:nobody _build/prod/rel/mobilizon ./
RUN mv /releases/${MOBILIZON_VERSION}/runtime.exs /etc/mobilizon/config.exs RUN cp /releases/${MOBILIZON_VERSION}/runtime.exs /etc/mobilizon/config.exs
COPY docker/production/docker-entrypoint.sh ./ COPY docker/production/docker-entrypoint.sh ./
ENTRYPOINT ["./docker-entrypoint.sh"] ENTRYPOINT ["./docker-entrypoint.sh"]

1
mix.exs
View file

@ -31,6 +31,7 @@ defmodule Mobilizon.Mixfile do
docs: docs(), docs: docs(),
releases: [ releases: [
mobilizon: [ mobilizon: [
include_executables_for: [:unix],
applications: [eldap: :transient], applications: [eldap: :transient],
config_providers: [{Mobilizon.ConfigProvider, "/etc/mobilizon/config.exs"}] config_providers: [{Mobilizon.ConfigProvider, "/etc/mobilizon/config.exs"}]
] ]