From 5bba62b733f8cac6d6c6387ea6b45e79c3cab9f2 Mon Sep 17 00:00:00 2001 From: Clement Date: Sun, 5 May 2024 15:44:26 +0200 Subject: [PATCH] feat: update docker compose and build Reviewed-on: https://git.lab-ouest.org/Epitech/ratrapage_T-WEB/pulls/10 --- .github/workflows/build_docker_express.yml | 4 +- docker-compose.yml | 66 ++++++++++++++++++++-- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_docker_express.yml b/.github/workflows/build_docker_express.yml index 4cdd4d1..aa7aa0c 100644 --- a/.github/workflows/build_docker_express.yml +++ b/.github/workflows/build_docker_express.yml @@ -46,8 +46,8 @@ jobs: - name: Build and push back uses: docker/build-push-action@v5 with: - context: ./front + context: ./Express/barAndCafe push: true - file: ./front/Dockerfile + file: ./Express/barAndCafe/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/docker-compose.yml b/docker-compose.yml index d3fc8ec..649fc7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,14 @@ version: "3.8" + services: + pocketbase: image: ghcr.io/coollabsio/pocketbase:latest environment: - SERVICE_FQDN_POCKETBASE_8080 volumes: - - ./.pb/pocketbase-data:/app/pb_data - - ./.pb/pocketbase-hooks:/app/pb_hooks + - ./pb/pocketbase-data:/app/pb_data + - ./pb/pocketbase-hooks:/app/pb_hooks labels: - traefik.enable=true - traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`) @@ -14,9 +16,10 @@ services: - traefik.http.routers.poketBaseTweb.tls.certresolver=le networks: - public + front: - image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head - depends_on: + image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head + depends_on: - pocketbase labels: - traefik.enable=true @@ -25,10 +28,65 @@ services: - traefik.http.routers.astroTweb.tls.certresolver=le networks: - public + + back_drink: + image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head + labels: + - traefik.enable=true + - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`) + - traefik.http.services.expressDrinkTweb.loadbalancer.server.port=${BACK_BASE_PORT} + - traefik.http.routers.expressDrinkTweb.tls.certresolver=le + networks: + - public + + docs_drink: + image: git.lab-ouest.org/epitech/ratrapage_t-web_drink_jsdocs:pr-6-head + labels: + - traefik.enable=true + - traefik.http.routers.docsDrinkTweb.rule=Host(`${DOCS_DRINK_URL}`) + - traefik.http.services.docsDrinkTweb.loadbalancer.server.port=${DOCS_BACK_BASE_PORT} + - traefik.http.routers.docsDrinkTweb.tls.certresolver=le + networks: + - public + + + blazegraph: + image: conjecto/blazegraph:2.1.5 + # ports: + # - 9999:9999 + environment: + JAVA_OPTS: -Xms6G -Xmx6G + volumes: + - ./datatourisme/dataset:/docker-entrypoint-initdb.d + ulimits: + nofile: + soft: 65536 + hard: 65536 + networks: + - graphQL + restart: unless-stopped + + datatourisme: + image: git.lab-ouest.org/epitech/fork-open-data-tourism:master + depends_on: + - blazegraph + networks: + - graphQL + restart: unless-stopped + labels: + - traefik.enable=true + - traefik.http.routers.dataTourisme.rule=Host(`${DATA_TOURISME_URL}`) + - traefik.http.services.dataTourisme.loadbalancer.server.port=${DATA_TOURISME_BASE_PORT} + - traefik.http.routers.dataTourisme.tls.certresolver=le + networks: + graphQL: {} public: external: true x-dockge: urls: - https://${POCKET_BASE_URL}/ - https://${FRONT_URL}/ + - https://${DOCS_DRINK_URL}/ + - https://${DRINK_URL}/ + - https://${DATA_TOURISME_URL}/ \ No newline at end of file