prepare working with volumes

docker/Debian_Uwsgi_PostgreSQL/Dockerfile

@@ -25,7 +25,6 @@ RUN apt-get update -q \
 # Ensure UTF-8
 RUN locale-gen en_US.UTF-8 en_us \
     && dpkg-reconfigure locales \
-    && dpkg-reconfigure locales \
     && locale-gen C.UTF-8 \
     && /usr/sbin/update-locale LANG=C.UTF-8
 ENV LANG C.UTF-8
@@ -39,8 +38,13 @@ RUN git clone https://github.com/tracim/tracim.git \
      && cd /tracim \
      && pip3 install -r install/requirements.txt
 
+# Prepare volumes
+RUN mkdir /etc/tracim
+VOLUME ["/etc/tracim"]
+VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
+
 # Copy needed files
-COPY uwsgi.ini /etc/uwsgi/apps-available/tracim.ini
+COPY uwsgi.ini /tracim/tracim/uwsgi.ini
 COPY wsgi.py /tracim/tracim/wsgi.py
 COPY entrypoint.sh /tracim/entrypoint.sh
 

docker/Debian_Uwsgi_PostgreSQL/entrypoint.sh

@@ -5,6 +5,7 @@
 # TODO: Supporter le changement des variables d'environnement ? (actuellement utilisé pour générer le .ini)
 # TODO: Fichiers de config link ls -s dans un dossier pour VOLUME
 # TODO: README QQCH pour les ports ? 80, 3060 et 5333
+# TODO: generate cookie secrent (if not yet done)
 
 # Start PostgreSQL
 service postgresql start
@@ -17,16 +18,25 @@ if ! [ "$( su - postgres -s /bin/bash -c "psql -tAc \"SELECT 1 FROM pg_database
 fi
 
 # Create config.ini file if no exist
-if [ ! -f /tracim/tracim/config.ini ]; then
-    cp /tracim/tracim/development.ini.base /tracim/tracim/config.ini
-    sed -i "s/\(sqlalchemy.url *= *\).*/\1postgresql:\/\/tracim:tracim@127.0.0.1:5432\/tracim?client_encoding=utf8/" /tracim/tracim/config.ini
-    # TODO: ENV VAR
+if [ ! -f /etc/tracim/config.ini ]; then
+    cp /tracim/tracim/development.ini.base /etc/tracim/config.ini
 fi
+ln -s /etc/tracim/config.ini /tracim/tracim/config.ini
 
 # Create wsgidav.conf file if no exist
-if [ ! -f /tracim/tracim/wsgidav.conf ]; then
-    cp /tracim/tracim/wsgidav.conf.sample /tracim/tracim/wsgidav.conf
+if [ ! -f /etc/tracim/wsgidav.conf ]; then
+    cp /tracim/tracim/wsgidav.conf.sample /etc/tracim/wsgidav.conf
 fi
+ln -s /etc/tracim/wsgidav.conf /tracim/tracim/wsgidav.conf
+
+# Create uwsgi file if no exist
+if [ ! -f /etc/tracim/uwsgi.ini ]; then
+    cp /tracim/tracim/uwsgi.ini /etc/tracim/uwsgi.ini
+fi
+
+# Update config with ENV
+# TODO Manage other ENV vars
+sed -i "s/\(sqlalchemy.url *= *\).*/\1postgresql:\/\/tracim:tracim@127.0.0.1:5432\/tracim?client_encoding=utf8/" /etc/tracim/config.ini
 
 # Start with uwsgi
-uwsgi --http-socket 0.0.0.0:80 /etc/uwsgi/apps-available/tracim.ini
+uwsgi --http-socket 0.0.0.0:80 /etc/tracim/uwsgi.ini