Skip to content
Merged

Dev #22

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

</details>
Expand Down Expand Up @@ -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

<details>
Expand Down
29 changes: 17 additions & 12 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
47 changes: 0 additions & 47 deletions docker-compose.test-prod.yml

This file was deleted.

1 change: 1 addition & 0 deletions flollylist_app
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1