Merge branch 'master' into nosslh

entrypoint shell
valentin.env
2022-08-20 20:41:11 +02:00 · 2022-08-19 19:02:18 +02:00 · 2022-08-19 18:57:10 +02:00 · 2022-08-19 18:55:34 +02:00 · 2022-08-17 18:32:09 +02:00
3 changed files with 8 additions and 2 deletions
@@ -11,7 +11,7 @@ services:
    image: marcpartensky/caddy
    ports:
      - "80:80"
-      # - "443:443"
+      - "443:443"
    environment:
      CADDY_INGRESS_NETWORKS: caddy
    volumes:
@@ -14,7 +14,7 @@ services:
      HTTPS_HOST: caddy
      HTTPS_PORT: 443
    ports:
-      - "443:8443"
+      # - "443:8443"
    # command: --tls=caddy:443 --ssh=marcpartensky.com:7022
    networks:
      - caddy
@@ -6,11 +6,17 @@ services:
    restart: unless-stopped
    environment:
      PRODUCTION: "True"
+    env_file:
+      - ../data/secrets/valentin.env
    build:
      context: ./
      dockerfile: Dockerfile
    networks:
      - caddy
+    entrypoint: sh -c "
+        ./manage.py migrate &&
+        /app/entrypoint.sh
+      "
    labels:
      caddy: valentin-colin.fr
      caddy.reverse_proxy: "{{upstreams 80}}"
Author	SHA1	Message	Date
marc	d289641cc6	Merge branch 'master' into nosslh	2022-08-20 20:41:11 +02:00
marc	ab953f1c2c	entrypoint shell	2022-08-19 19:02:18 +02:00
marc	80fe8cbe9e	valentin.env	2022-08-19 18:57:10 +02:00
marc	e4e7d76592	migrating first btw	2022-08-19 18:55:34 +02:00
marc	16139153a9	443 for caddy	2022-08-17 18:32:09 +02:00