edit docker compose config

fix: requirements.txt to reduce vulnerabilities


The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-CRYPTOGRAPHY-7886970

Co-authored-by: snyk-bot <snyk-bot@snyk.io>

Dockerfile

@@ -11,10 +11,13 @@ WORKDIR $APP_DIR
 COPY ["setup.py", "requirements.txt", "MANIFEST.in", "README.rst", "AUTHORS.rst", "$APP_DIR/"]
 COPY ["./snappass", "$APP_DIR/snappass"]
 
+RUN pip install -r requirements.txt
+
+RUN pybabel compile -d snappass/translations
+
 RUN python setup.py install && \
     chown -R snappass $APP_DIR && \
     chgrp -R snappass $APP_DIR
-RUN pip install -r requirements.txt
 
 USER snappass
 

MANIFEST.in

@@ -1,3 +1,4 @@
 include *.rst LICENSE
 recursive-include snappass/static *
 recursive-include snappass/templates *
+recursive-include snappass/translations *

dev-requirements.txt

@@ -1,9 +1,9 @@
 coverage==7.6.0
-fakeredis==2.23.4
-flake8==7.0.0
+fakeredis==2.24.1
+flake8==7.1.1
 freezegun==1.5.1
-pytest==8.1.0
+pytest==8.3.2
 pytest-cov==5.0.0
-tox==4.16.0
+tox==4.18.0
 bumpversion==0.6.0
-wheel==0.43.0
+wheel==0.44.0

docker-compose.yml

@@ -2,17 +2,43 @@ version: '2'
 
 services:
 
-    snappass:
-        build: .
-        image: pinterest/snappass
-        ports:
-            - "5000:5000"
-        stop_signal: SIGINT
-        environment:
-            - REDIS_HOST=redis
-            - NO_SSL=True
-        depends_on:
-          - redis
+  snappass:
+    build: .
+    #image: pinterest/snappass
+    #ports:
+    #   - "5000:5000"
+    stop_signal: SIGINT
+    environment:
+      - REDIS_HOST=redis
+      - NO_SSL=True
+      - VIRTUAL_HOST=share.brothertec.eu
+      - VIRTUAL_PORT=5000
+      - LETSENCRYPT_HOST=share.brothertec.eu
+      - LETSENCRYPT_EMAIL=admin@brothertec.eu
 
-    redis:
-        image: "redis:latest"
+    restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+
+    networks:
+      - default
+      - proxy
+      - edge-tier
+
+    depends_on:
+      - redis
+
+  redis:
+    image: "redis:latest"
+    restart: unless-stopped
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+
+
+networks:
+  proxy:
+    name: nginx-proxy
+    external: true
+  edge-tier:
+    name: edge
+    external: true

requirements.txt

@@ -1,4 +1,4 @@
-cryptography==42.0.8
+cryptography==43.0.1
 Flask==3.0.0
 itsdangerous==2.2.0
 Jinja2==3.1.4

snappass/main.py

@@ -11,7 +11,8 @@ from urllib.parse import quote_plus
 from urllib.parse import unquote_plus
 from urllib.parse import urljoin
 from distutils.util import strtobool
-from flask_babel import Babel
+# _ is required to get the Jinja templates translated
+from flask_babel import Babel, _  # noqa: F401
 
 NO_SSL = bool(strtobool(os.environ.get('NO_SSL', 'False')))
 URL_PREFIX = os.environ.get('URL_PREFIX', None)