Merge branch 'main' into BLK_nonfree

# Conflicts:
#	Docker/Production/docker-compose.yml

Docker/Production/docker-compose.yml

@@ -1,67 +1,63 @@
 version: '3.7'
 services:
-  tibillet_postgres:
+  billetterie_postgres_demo:
-    container_name: tibillet_postgres
+    extends:
-    image: postgres:11.5-alpine
+      file: ../compose/docker-compose-base.yml
-    restart: always
+      service: billetterie_postgres
-#    ports:
-#      - 5432:5432
-    volumes:
-      - "../../Postgres/dbdata:/var/lib/postgresql/data"
-      - "/etc/localtime:/etc/localtime:ro"
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
-    networks:
-      - backend-tibillet
-
-
-  tibillet_django:
-    container_name: tibillet_django
-    build: ../Dockerfile/
-    restart: always
     env_file: .env
-#    ports:
+    networks:
-#      - 8002:8002
+      - backend-billeterie
-    volumes:
+
-      - "../../DjangoFiles:/DjangoFiles"
+  billetterie_redis_demo:
-      - "../../Docker/bashrc:/root/.bashrc"
+    extends:
-      - "../../Backup:/Backup"
+      file: ../compose/docker-compose-base.yml
-    working_dir: /DjangoFiles
+      service: billetterie_redis
+    networks:
+      - backend-billeterie
+
+  billetterie_django_demo:
+    extends:
+      file: ../compose/docker-compose-base.yml
+      service: billetterie_django
     command: "bash /DjangoFiles/launch_prod.sh"
+    env_file: .env
+
     depends_on:
-      - tibillet_postgres
+      - billetterie_postgres_demo
+    links:
+      - billetterie_postgres_demo:billetterie_postgres
+      - billetterie_redis_demo:redis
     networks:
       - frontend
-      - backend-tibillet
+      - backend-billeterie
 
-  tibillet_celery:
+  billetterie_celery_demo:
-    container_name: tibillet_celery
+    extends:
-    build: ../Dockerfile/
+      file: ../compose/docker-compose-base.yml
-    restart: always
+      service: billetterie_celery
+    command: "bash /DjangoFiles/launch_celery.sh"
     env_file: .env
-    volumes:
-      - "../../DjangoFiles:/DjangoFiles"
-      - "../../Docker/bashrc:/root/.bashrc"
-    working_dir: /DjangoFiles
-    command: "bash /DjangoFiles/launch.sh"
     depends_on:
-      - tibillet_django
+      - billetterie_django_demo
+    links:
+      - billetterie_postgres_demo:billetterie_postgres
+      - billetterie_redis_demo:redis
     networks:
-      - backend-tibillet
+      - frontend
+      - backend-billeterie
 
-  tibillet_nginx:
+
-    container_name: billeterie_nginx
+  billetterie_nginx_demo:
-    image: nginx
+    extends:
-    restart: always
+      file: ../compose/docker-compose-base.yml
-    volumes:
+      service: billetterie_nginx
-      - ../../DjangoFiles:/DjangoFiles
+    ports:
-      - ../../Nginx:/etc/nginx/conf.d
+      - 8002:80
-    #    ports:
+    env_file: .env
-#      - 8008:80
     depends_on:
-      - tibillet_django
+      - billetterie_django_demo
+    links:
+      - billetterie_django_demo:billetterie_django
     labels:
       - traefik.enable=true
       - traefik.docker.network=frontend
@@ -70,17 +66,10 @@ services:
     networks:
       - frontend
 
-  redis:
-    image: redis:6-alpine
-    restart: always
-    container_name: redis
-    hostname: redis
-    networks:
-      - backend-tibillet
 
 networks:
   frontend:
     external: true
-  backend-tibillet:
+  backend-billeterie:
-    name: "backend-tibillet"
+    name: "backend-billeterie"
 

Docker/compose/docker-compose-base.yml

@@ -0,0 +1,51 @@
+version: '3.7'
+services:
+  billetterie_postgres:
+    container_name: billetterie_postgres
+    image: postgres:11.5-alpine
+    restart: always
+    volumes:
+      - "../../Postgres/dbdata:/var/lib/postgresql/data"
+      - "/etc/localtime:/etc/localtime:ro"
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+
+  billetterie_redis:
+    container_name: billetterie_redis
+    image: redis:6-alpine
+    restart: always
+    hostname: redis
+
+  billetterie_django:
+    container_name: billetterie_django
+    build: ../Dockerfile/
+    restart: always
+#    ports:
+#      - 8002:8002
+    volumes:
+      - "../../DjangoFiles:/DjangoFiles"
+      - "../../Backup:/Backup"
+      - "../../Docker/bashrc:/root/.bashrc"
+    working_dir: /DjangoFiles
+#    command: "bash /DjangoFiles/launch.sh"
+
+  billetterie_celery:
+    container_name: billetterie_celery
+    build: ../Dockerfile/
+    restart: always
+    volumes:
+      - "../../DjangoFiles:/DjangoFiles"
+      - "../../Docker/bashrc:/root/.bashrc"
+    working_dir: /DjangoFiles
+#    command: "bash /DjangoFiles/launch.sh"
+
+
+  billetterie_nginx:
+    container_name: billetterie_nginx
+    image: nginx
+    restart: always
+    volumes:
+      - ../../DjangoFiles:/DjangoFiles
+      - ../../Nginx:/etc/nginx/conf.d