From 8559721fd039db7c8764a9e02002416cd5aee24f Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Thu, 23 Nov 2023 12:33:16 +0300 Subject: [PATCH] Update dockerfile for dev and prod --- dockerize/Makefile | 1 + dockerize/docker/Dockerfile | 3 +++ dockerize/production/Dockerfile | 4 ++++ setup.cfg | 1 + 4 files changed, 9 insertions(+) diff --git a/dockerize/Makefile b/dockerize/Makefile index fa4334e2..1ad35681 100644 --- a/dockerize/Makefile +++ b/dockerize/Makefile @@ -141,6 +141,7 @@ dbrestore: @echo "Restore dump from backups/latest.dmp in production mode" @echo "------------------------------------------------------------------" @# - prefix causes command to continue even if it fails + @# - TODO: This command needs update since postgis has been updated. @echo "stopping web container" @docker-compose -p $(PROJECT_ID) stop web @echo "dropping gis" diff --git a/dockerize/docker/Dockerfile b/dockerize/docker/Dockerfile index 10eb7660..f7f77638 100644 --- a/dockerize/docker/Dockerfile +++ b/dockerize/docker/Dockerfile @@ -43,6 +43,9 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so ENV NOTVISIBLE "in users profile" RUN echo "export VISIBLE=now" >> /etc/profile +# Install freezegun for feedback test +RUN pip install freezegun + # -------------------------------------------------------- # Open ports as needed # -------------------------------------------------------- diff --git a/dockerize/production/Dockerfile b/dockerize/production/Dockerfile index a51f6e85..9453fffc 100644 --- a/dockerize/production/Dockerfile +++ b/dockerize/production/Dockerfile @@ -5,6 +5,10 @@ MAINTAINER Dimas Ciputra #RUN ln -s /bin/true /sbin/initctl RUN apt-get clean all + +# Debian stretch/updates release issue. please see https://serverfault.com/a/1130167 +RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list + RUN apt-get update && apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev ARG BRANCH_TAG=develop diff --git a/setup.cfg b/setup.cfg index fae25c68..2fa09d19 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,7 @@ exclude = .git, .venv/, ./.venv/, + venv/, vagrant_assets, qgis-app/*/migrations/, qgis-app/plugins/tests/HelloWorld/,