Change directory structure (move ./nopaque/* to ./)

.dockerignore

@@ -0,0 +1 @@
+data

.env.tpl

@@ -1,11 +1,11 @@
 ################################################################################
 # Docker                                                                       #
 ################################################################################
-# DEFAULT: ./db
+# DEFAULT: ./data/db
 # NOTE: Use `.` as <project-root-dir>
 # HOST_DB_DIR=
 
-# DEFAULT: ./mq
+# DEFAULT: ./data/mq
 # NOTE: Use `.` as <project-root-dir>
 # HOST_MQ_DIR=
 

Dockerfile

@@ -10,7 +10,7 @@ ARG GID
 ENV LANG=C.UTF-8
 
 
-EXPOSE 5000
+ENV FLASK_APP nopaque.py
 
 
 RUN apt-get update \
@@ -26,10 +26,17 @@ RUN groupadd --gid ${DOCKER_GID} --system docker \
 USER nopaque
 WORKDIR /home/nopaque
 
-
+COPY --chown=nopaque:nopaque requirements.txt ./
-COPY --chown=nopaque:nopaque [".", "."]
 RUN python -m venv venv \
  && venv/bin/pip install --requirement requirements.txt
 
 
+COPY --chown=nopaque:nopaque app app
+COPY --chown=nopaque:nopaque migrations migrations
+COPY --chown=nopaque:nopaque tests tests
+COPY --chown=nopaque:nopaque boot.sh config.py nopaque-daemon.sh nopaque.py ./
+
+
+# run-time configuration
+EXPOSE 5000
 ENTRYPOINT ["./boot.sh"]

README.md

@@ -39,6 +39,8 @@ username@hostname:~$ sudo mount --types cifs --options gid=${USER},password=nopa
 ``` bash
 # Clone the nopaque repository
 username@hostname:~$ git clone https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
+# Create data directories for the database and message queue
+username@hostname:~$ mkdir data/{db,mq}
 username@hostname:~$ cp db.env.tpl db.env
 username@hostname:~$ cp .env.tpl .env
 # Fill out the variables within these files.
@@ -58,7 +60,7 @@ username@hostname:~$ docker-compose build
 touch nopaque.log nopaqued.log
 # For background execution add the -d flag
 username@hostname:~$ docker-compose up
-# To scale your app use
+# To scale your app use the following command after starting it normally
 username@hostname:~$ docker-compose -f docker-compose.yml \
                                     -f docker-compose.override.yml
                                     -f docker-compose.scale.yml