Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-11-08 18:45:32 +01:00
parent 8ecfa742d0
commit 95cb46b1d1
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
2 changed files with 21 additions and 11 deletions

View File

@ -48,19 +48,25 @@ LABEL org.opencontainers.image.title="mobilizon" \
org.opencontainers.image.revision=$VCS_REF \
org.opencontainers.image.created=$BUILD_DATE
RUN apk add --no-cache openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick python3 py3-pip py3-pillow py3-cffi py3-brotli gcc musl-dev python3-dev pango libxslt-dev
RUN apk add --no-cache bash openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick python3 py3-pip py3-pillow py3-cffi py3-brotli gcc musl-dev python3-dev pango libxslt-dev
RUN pip install weasyprint pyexcel-ods3
RUN mkdir -p /app/uploads && chown nobody:nobody /app/uploads
RUN mkdir -p /etc/mobilizon && chown nobody:nobody /etc/mobilizon
RUN adduser -h /home/user -s /bin/bash user && addgroup user user
RUN mkdir -p /var/lib/mobilizon/uploads && chown user:user /var/lib/mobilizon/uploads
RUN mkdir -p /etc/mobilizon && chown user:user /etc/mobilizon
USER nobody
USER user
EXPOSE 4000
ENV MOBILIZON_DOCKER=true
COPY --from=builder --chown=nobody:nobody _build/prod/rel/mobilizon ./
COPY --from=builder --chown=user:user _build/prod/rel/mobilizon ./
RUN cp /releases/*/runtime.exs /etc/mobilizon/config.exs
COPY docker/production/docker-entrypoint.sh ./
VOLUME /var/lib/mobilizon/uploads
VOLUME /etc/mobilizon/config.exs:ro
VOLUME /var/lib/mobilizon/geo_db/GeoLite2-City.mmdb
ENTRYPOINT ["./docker-entrypoint.sh"]
CMD "/bin/mobilizon start"

View File

@ -1,8 +1,12 @@
#!/bin/sh
#!/bin/bash
set -e
echo "-- Waiting for database..."
USER_ID=${LOCAL_USER_ID:-9001}
echo "[ENTRYPOINT] Starting with UID : $USER_ID"
echo "[ENTRYPOINT] -- Waiting for database..."
while ! pg_isready -U ${MOBILIZON_DATABASE_USERNAME} -d postgres://${MOBILIZON_DATABASE_HOST}:5432/${MOBILIZON_DATABASE_DBNAME} -t 1; do
sleep 1s
done
@ -10,8 +14,8 @@ done
PGPASSWORD=$MOBILIZON_DATABASE_PASSWORD psql -U $MOBILIZON_DATABASE_USERNAME -d $MOBILIZON_DATABASE_DBNAME -h $MOBILIZON_DATABASE_HOST -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm;'
PGPASSWORD=$MOBILIZON_DATABASE_PASSWORD psql -U $MOBILIZON_DATABASE_USERNAME -d $MOBILIZON_DATABASE_DBNAME -h $MOBILIZON_DATABASE_HOST -c 'CREATE EXTENSION IF NOT EXISTS unaccent;'
echo "-- Running migrations..."
/bin/mobilizon_ctl migrate
echo "[ENTRYPOINT] -- Running migrations..."
exec su user -c "/bin/mobilizon_ctl migrate"
echo "-- Starting!"
exec /bin/mobilizon start
echo "[ENTRYPOINT] -- Starting!"
exec su user -c "$@"