Submodule web/app ee27362..1bf4369:
  > Merge branch '1-same-resolution-for-the-mark-and-reference-for-the-image-download-in-the-cnm-interface' into 'develop'

diff --git a/docker-compose.yml b/docker-compose.yml
index 373f09a..3637170 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,19 @@
 version: '3.7'
 services:
-    db:
-        image: postgres:11
-        volumes:
-            - ./db/data:/var/lib/postgresql/data
-        environment:
-            - POSTGRES_PASSWORD=icnml
-        ports:
-            - 127.0.0.1:5432:5432
+    # db:
+    #     image: postgres:11
+    #     volumes:
+    #         - ./db/data:/var/lib/postgresql/data
+    #     environment:
+    #         - POSTGRES_PASSWORD=icnml
+    #     ports:
+    #         - 127.0.0.1:5432:5432

     web:
         build: web
-        ports:
-            - 80:5000
+        network_mode: host
+        # ports:
+        #     - 80:5000
         env_file:
             - env
         volumes:
@@ -21,7 +22,7 @@ services:
         entrypoint: python2 dev.py
         depends_on:
             - redis
-            - db
+            # - db

     redis:
         build: redis
diff --git a/web/Dockerfile b/web/Dockerfile
index bedbe4c..f9b0b0f 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -14,7 +14,7 @@ RUN python2 /tmp/get-pip.py
 ################################################################################
 #    User configuration

-RUN adduser --shell /bin/true --no-create-home --uid 999 --disabled-password --disabled-login icnml && \
+RUN adduser --shell /bin/true --no-create-home --uid 1000 --disabled-password --disabled-login icnml && \
     sed -i -r "/^(icnml|root)/!d" /etc/group /etc/passwd && \
     sed -i -r 's#^(.*):[^:]*$#\1:/sbin/nologin#' /etc/passwd

Submodule web/app ee3b668..81a7d19:
  > Merge branch 'feature/cnm/admin_all_marks_quality' into develop

Submodule web/app 082293b..ee3b668:
  > Patch the configuration file
  > Add the REDIS_URL env variable

Submodule web/app 872953b..2c91346:
  > Merge branch 'feature/cnm/admin_all_marks_quality' into develop

Submodule web/library/NIST 641e709..1ff8a20:
  > Merge branch 'develop' into feature/XML
Submodule web/library/PiAnoS f016e86..48dc229:
  > Add the 'get_print_id' function
  > Add the 'get_user_group_id' function

Submodule web/app cb10463..872953b:
  > Merge branch 'feature/cnm/admin_all_marks_quality' into develop
Submodule web/library/NIST 641e709..1ff8a20:
  > Merge branch 'develop' into feature/XML
Submodule web/library/PiAnoS f016e86..48dc229:
  > Add the 'get_print_id' function
  > Add the 'get_user_group_id' function

Submodule web/library/MDmisc f1d0493..6d9f769:
  > Add the test for the 'up' parameter in the int_to_bin() function
  > Refactoring of the int_to_bin function

Submodule web/app contains modified content
Submodule web/app 0fec9ab..cb10463:
  > Merge branch 'feature/cnm/split_incidentals_per_donor' into develop
  > Remove the link to the related files on the login page

Submodule web/app contains modified content
Submodule web/app d2e8056..0fec9ab:
  > Patch CNM images files to web standard

Submodule web/app contains modified content
Submodule web/app 8bd10d7..d2e8056:
  > Patch the creation of the thumbnail for the CNM image_auto_detect_format() function

Submodule web/app 3946b1f..8bd10d7:
  > Set the upload limit to 1014Mb for the CNM files

Submodule web/app ebc7654..3946b1f:
  > Merge branch 'patch/afis_add_incidental_marks_as_target_folder' into develop

Submodule web/app 476d5a6..ebc7654:
  > Merge branch 'patch/afis_add_incidental_marks_as_target_folder' into develop

Submodule web/app f2db2c9..476d5a6:
  > Add the left and right full palm images on the nist_view page

Submodule web/library/NIST f80f7f6..bea91ee:
  > Merge branch 'develop' into feature/XML
  > Merge branch 'develop' into feature/XML
  > Merge branch 'develop' into feature/XML

Submodule web/library/NIST 54d10d9..f80f7f6:
  > Merge branch 'develop' into feature/XML

Submodule web/library/NIST 14bc6ec..54d10d9:
  > Merge branch 'develop' into feature/XML

Submodule web/library/NIST 1a999c2..14bc6ec:
  > Merge branch 'develop' into feature/XML

Submodule web/app c00b842..f2db2c9:
  > Add the outside click to close functionality to the user TOTP first configuration dialog
  > Merge branch 'refactoring/totp_reconfiguration_dialog' into develop

Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..743397c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,8 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
-        entrypoint: python dev.py
         depends_on:
             - redis
             - db
Submodule web/app bf5e2f5..c00b842:
  > Merge branch 'patch/multi_threaded_gevent' into develop
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app 0b8dbfc..bf5e2f5:
  > Add support for the preview of tiff files for CNM cards
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app 777bdb2..0b8dbfc:
  > Revert "Add the "NIST files" mention on the upload form"
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app dde2ac7..777bdb2:
  > Add the "NIST files" mention on the upload form
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app 546dbe2..dde2ac7:
  > Add the toastr message for the CNM zip file download process
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app 3373d60..546dbe2:
  > Merge branch 'refactoring/use_post_for_unpredictable_jinja_variable' into develop
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app b52a647..3373d60:
  > Merge branch 'afis/only_target_marks' into develop
  > Merge branch 'feature/mark_list_delete_on_right_click' into develop
  > Refactoring of the admin part of the admin_show_target() page
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app 1a8b360..b52a647:
  > Add the link to the mark page on the admin target page
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML

diff --git a/docker-compose.yml b/docker-compose.yml
index 20b49fb..166bec5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             - env
         volumes:
             - ./web/app:/app
+            - ./files:/files
             - /etc/localtime:/etc/localtime:ro
         entrypoint: python dev.py
         depends_on:
Submodule web/app bbecc35..1a8b360:
  > Patch the duplicate of marks in the admin target page if multiples zones are assigned to the mark
Submodule web/library/NIST 9bd469d..1a999c2:
  > Merge branch 'develop' into feature/XML