diff --git a/Docker/Production/docker-compose.yml b/Docker/Production/docker-compose.yml index cbf9c1a..f627430 100644 --- a/Docker/Production/docker-compose.yml +++ b/Docker/Production/docker-compose.yml @@ -3,54 +3,61 @@ services: billetterie_postgres_demo: extends: file: ../compose/docker-compose-base.yml - service: tibillet_postgres + service: billetterie_postgres + env_file: .env networks: - - backend-tibillet + - backend-billeterie billetterie_redis_demo: extends: file: ../compose/docker-compose-base.yml - service: redis + service: billetterie_redis networks: - - backend-tibillet + - backend-billeterie billetterie_django_demo: extends: file: ../compose/docker-compose-base.yml - service: tibillet_django + service: billetterie_django command: "bash /DjangoFiles/launch_prod.sh" + env_file: .env + depends_on: - billetterie_postgres_demo links: - - billetterie_postgres_demo:tibillet_postgres + - billetterie_postgres_demo:billetterie_postgres + - billetterie_redis_demo:redis networks: - frontend - - backend-tibillet + - backend-billeterie billetterie_celery_demo: extends: file: ../compose/docker-compose-base.yml - service: tibillet_celery + service: billetterie_celery command: "bash /DjangoFiles/launch_celery.sh" + env_file: .env depends_on: - billetterie_django_demo links: - - billetterie_postgres_demo:tibillet_postgres + - billetterie_postgres_demo:billetterie_postgres + - billetterie_redis_demo:redis networks: - frontend - - backend-tibillet + - backend-billeterie - billeterie_nginx: + billetterie_nginx_demo: extends: file: ../compose/docker-compose-base.yml - service: tibillet_nginx - # ports: -# - 8008:80 + service: billetterie_nginx + ports: + - 8002:80 + env_file: .env depends_on: - - billetterie_django + - billetterie_django_demo links: - - billetterie_django:tibillet_django + - billetterie_django_demo:billetterie_django labels: - traefik.enable=true - traefik.docker.network=frontend @@ -63,6 +70,6 @@ services: networks: frontend: external: true - backend-tibillet: - name: "backend-tibillet" + backend-billeterie: + name: "backend-billeterie" diff --git a/Docker/compose/docker-compose-base.yml b/Docker/compose/docker-compose-base.yml new file mode 100644 index 0000000..b2872d6 --- /dev/null +++ b/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