From e79a07b3fedcd583a38c82f17d067e5f39e09ac5 Mon Sep 17 00:00:00 2001
From: Mindstan <mindstan@hotmail.fr>
Date: Sat, 24 Oct 2020 16:38:37 +0200
Subject: [PATCH] [Mobilizon] Fixed multiple bugs | build working
---
pica-mobilizon/app/Dockerfile | 4 ++--
pica-mobilizon/docker-compose.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pica-mobilizon/app/Dockerfile b/pica-mobilizon/app/Dockerfile
index 7289efb3..4b19c5b7 100644
--- a/pica-mobilizon/app/Dockerfile
+++ b/pica-mobilizon/app/Dockerfile
@@ -18,9 +18,9 @@ RUN apt-get update -y \
RUN useradd -ms /bin/bash -p ! mobilizon
USER mobilizon
WORKDIR /home/mobilizon
-COPY ./prod.secret.exs /home/mobilizon/build/config/
RUN git clone -b "$MOBILIZON_GIT_TAG" "$MOBILIZON_GIT_URL" ./build
WORKDIR /home/mobilizon/build
+COPY ./prod.secret.exs /home/mobilizon/build/config/
RUN mix local.hex --force \
&& mix local.rebar --force
RUN mix deps.get
@@ -42,7 +42,7 @@ ENV INIT=FALSE \
MIX_ENV=prod \
INSTANCE_CONFIG=prod
RUN addgroup -S mobilizongr && adduser -s /bin/bash -S mobilizon -G mobilizongr
-RUN apk update && apk add --update git && rm-rf /tmp/* /var/tmp/*
+RUN apk update && apk add --update git && rm -rf /tmp/* /var/tmp/*
COPY --from=builder /home/mobilizon/build/ /home/mobilizon/live/
COPY --from=builder /home/mobilizon/.mix/ /home/mobilizon/.mix/
COPY ./entrypoint.sh /home/mobilizon/entrypoint.sh
diff --git a/pica-mobilizon/docker-compose.yml b/pica-mobilizon/docker-compose.yml
index 646ad330..113c9192 100644
--- a/pica-mobilizon/docker-compose.yml
+++ b/pica-mobilizon/docker-compose.yml
@@ -15,14 +15,14 @@ volumes:
services:
mobilizon:
- image: registry.picasoft.net/pica-mobilizon:1.0.0.rc4
+ image: registry.picasoft.net/pica-mobilizon:1.0.0-rc.4
build:
context: ./app
dockerfile: Dockerfile
args:
- NODE_V=14
- MOBILIZON_GIT_URL=https://framagit.org/framasoft/mobilizon.git
- - MOBILIZON_GIT_TAG=1.0.0.rc4
+ - MOBILIZON_GIT_TAG=1.0.0-rc.4
- MIX_ENV=prod
container_name: mobilizon-app
volumes:
--
GitLab