diff --git a/README.md b/README.md index 628f12c..0549f24 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ - [FlorAccess serveur](#floraccess-serveur) - [Econoris serveur](#econoris-serveur) - [Econoris app](#econoris-app) + - [FlollyList serveur](#flollylist-serveur) + - [FlollyList app](#flollylist-app) - [Architecture](#architecture) @@ -106,6 +108,14 @@ Avant de commencer, assurez-vous d'avoir satisfait aux exigences suivantes : [Econoris app](https://github.com/FloRobart/econoris_app) est le frontend de l'application Econoris. +### [FlollyList serveur](https://github.com/FloRobart/FlollyList_server) + +[FlollyList](https://github.com/FloRobart/FlollyList_server) serveur est le backend de l'application FlollyList. + +### [FlollyList app](https://github.com/FloRobart/flollylist_app) + +[FlollyList app](https://github.com/FloRobart/flollylist_app) est le frontend de l'application FlollyList. + ## Architecture
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 462766b..985f4ee 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,9 +26,7 @@ services: #========# # FlorAccess Server # floraccess-server: - build: - context: ./FlorAccess_server - dockerfile: Dockerfile + image: node:lts-alpine volumes: - ./FlorAccess_server:/app/ - ./FlorAccess_server/node_modules:/app/node_modules @@ -38,9 +36,7 @@ services: # Econoris Server # econoris-server: - build: - context: ./Econoris_server - dockerfile: Dockerfile + image: node:lts-alpine volumes: - ./Econoris_server:/app/ - ./Econoris_server/node_modules:/app/node_modules @@ -50,9 +46,7 @@ services: # FlollyList Server # flollylist-server: - build: - context: ./FlollyList_server - dockerfile: Dockerfile + image: node:lts-alpine volumes: - ./FlollyList_server:/app/ - ./FlollyList_server/node_modules:/app/node_modules @@ -64,12 +58,23 @@ services: #==========# # Web apps # #==========# + # Econoris App Web # econoris-app-web: - build: - context: ./econoris_app - dockerfile: Dockerfile + image: nginx:stable-alpine volumes: - ./econoris_app/build/web:/usr/share/nginx/html/ + - ./econoris_app/nginx.conf:/etc/nginx/conf.d/default.conf + command: ["nginx", "-g", "daemon off;"] + working_dir: /app + environment: + - FLUTTER_ENV=dev + + # FlollyList App Web # + flollylist-app-web: + image: nginx:stable-alpine + volumes: + - ./flollylist_app/build/web:/usr/share/nginx/html/ + - ./flollylist_app/nginx.conf:/etc/nginx/conf.d/default.conf command: ["nginx", "-g", "daemon off;"] working_dir: /app environment: diff --git a/docker-compose.proxy.yml b/docker-compose.proxy.yml index ab5cbfa..fbb055a 100644 --- a/docker-compose.proxy.yml +++ b/docker-compose.proxy.yml @@ -75,7 +75,7 @@ services: - "traefik.http.routers.econoris-app-web.tls.certresolver=le" - "traefik.http.services.econoris-app-web.loadbalancer.server.port=80" - # FlollyList Server # + # FlollyList App Web # flollylist-app-web: labels: - "traefik.enable=true" diff --git a/docker-compose.test-prod.yml b/docker-compose.test-prod.yml deleted file mode 100644 index 2cff5eb..0000000 --- a/docker-compose.test-prod.yml +++ /dev/null @@ -1,47 +0,0 @@ -services: - #==========# - # Database # - #==========# - # FlorAccess Database # - floraccess-db: - build: - context: ./FlorAccess_server/Database - dockerfile: Dockerfile - - # Econoris Database # - econoris-db: - build: - context: ./Econoris_server/Database - dockerfile: Dockerfile - - - #========# - # Server # - #========# - # FlorAccess Server # - floraccess-server: - build: - context: ./FlorAccess_server - dockerfile: Dockerfile - tmpfs: - - /app/src/swagger/json:rw,uid=1800,gid=1800 - - # Econoris Server # - econoris-server: - build: - context: ./Econoris_server - dockerfile: Dockerfile - tmpfs: - - /app/src/swagger/json:rw,uid=1800,gid=1800 - - - #==========# - # Web apps # - #==========# - econoris-app-web: - build: - context: ./econoris_app - dockerfile: Dockerfile - working_dir: /app - environment: - - FLUTTER_ENV=dev \ No newline at end of file diff --git a/flollylist_app b/flollylist_app new file mode 120000 index 0000000..54ac804 --- /dev/null +++ b/flollylist_app @@ -0,0 +1 @@ +../flollylist_app \ No newline at end of file diff --git a/version b/version index 1cc5f65..8cfbc90 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.0 \ No newline at end of file +1.1.1 \ No newline at end of file