From b71886503059f87688cf0e42fb0fe542bb43e7e3 Mon Sep 17 00:00:00 2001 From: Julien Aldon Date: Tue, 13 Jan 2026 15:55:32 +0100 Subject: [PATCH] add ROOT_FQDN env variable --- docker-compose.dev.yml | 52 ++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 3 +++ front/Dockerfile | 3 +++ front/src/config.js | 3 +-- 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 docker-compose.dev.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..b6ab9d8 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,52 @@ +version: "3.9" + +services: + back: + image: python:3.10 + working_dir: /code + volumes: + - ./back:/code + command: > + sh -c "pip install -r requirements.txt && + uvicorn main:app --host 0.0.0.0 --port 8000 --reload" + environment: + SERVICE_ORIGIN: ${SERVICE_ORIGIN} + DB_HOST: database + MARIADB_USER: ${MARIADB_USER} + MARIADB_PASSWORD: ${MARIADB_PASSWORD} + MARIADB_DATABASE: ${MARIADB_DATABASE} + SERVICE_SECRET_KEY: ${SERVICE_SECRET_KEY} + ports: + - "8000:8000" + depends_on: + - database + + front: + image: node:19.1-alpine + working_dir: /app + volumes: + - ./front:/app + command: sh -c "npm install && npm run serve" + ports: + - "8080:8080" + environment: + VUE_APP_ROOT_FQDN: ${SERVICE_ROOT_FQDN} + depends_on: + - back + + database: + image: mariadb + restart: always + environment: + MARIADB_USER: ${MARIADB_USER} + MARIADB_PASSWORD: ${MARIADB_PASSWORD} + MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD} + MARIADB_DATABASE: ${MARIADB_DATABASE} + volumes: + - db:/var/lib/mysql + - ./back/db/:/docker-entrypoint-initdb.d/ + ports: + - "3306:3306" + +volumes: + db: diff --git a/docker-compose.yml b/docker-compose.yml index a5a2bdf..ec1d13e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: build: context: . dockerfile: front/Dockerfile + args: + VUE_APP_ROOT_FQDN: ${ROOT_FQDN} ports: - 80:80 depends_on: @@ -32,6 +34,7 @@ services: MARIADB_PASSWORD: ${MARIADB_PASSWORD} MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD} MARIADB_DATABASE: ${MARIADB_DATABASE} + ROOT_FQDN: ${ROOT_FQDN} volumes: - db:/var/lib/mysql - ./back/db/:/docker-entrypoint-initdb.d/ diff --git a/front/Dockerfile b/front/Dockerfile index 8073818..46c06a1 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -2,6 +2,9 @@ FROM node:19.1-alpine AS build WORKDIR /app +ARG VUE_APP_ROOT_FQDN +ENV VUE_APP_ROOT_FQDN=$VUE_APP_ROOT_FQDN + COPY front/package.json front/package-lock.json /app/ RUN npm install diff --git a/front/src/config.js b/front/src/config.js index 31082c1..b988e2e 100644 --- a/front/src/config.js +++ b/front/src/config.js @@ -1,5 +1,4 @@ -const ROOT_FQDN = 'https://bookshelf.aldon.fr/api'; -// const ROOT_FQDN = 'http://localhost:8000/api'; +const ROOT_FQDN = process.env.VUE_APP_ROOT_FQDN export { ROOT_FQDN