Skip to content

Commit ce36039

Browse files
authored
Merge pull request #35 from FloRobart/dev
fix(variable name): Change environnement variable name for flower garden app
2 parents 71fefeb + 975391f commit ce36039

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FLOLLYLIST_DB_USER=postgres # Same as POSTGRES_USER in ./config/.env.flollylist_
1010
FLOLLYLIST_DB_NAME=flollylist # Same as POSTGRES_DB in ./config/.env.flollylist_db
1111
FLOLLYLIST_SERVER_PORT=26004 # Port to access the FlollyList server
1212

13-
DIR_CACHE_PATH=public/html/cache # Path to the directory where the hosts projects HTML page will be saved (example: "public/html/cache")
13+
FLOWER_GARDEN_APP_DIR_CACHE_PATH=public/html/cache # Path to the directory where the hosts projects HTML page will be saved (example: "public/html/cache")
1414

1515
ECONORIS_APP_PORT=26003 # Port to access the Econoris app
1616
FLOLLYLIST_APP_PORT=26005 # Port to access the FlollyList app

docker-compose.dev.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ services:
7575
- ./FlorAccess_server:/app/
7676
command: ["npm", "run", "dev"]
7777
tmpfs:
78-
- /tmp:exec,nosuid,nodev
78+
- /tmp:exec,nosuid,nodev,uid=1800,gid=1800
7979
healthcheck:
8080
test: ["CMD-SHELL", "wget -q --spider http://floraccess-server:80/ || exit 1"]
8181
interval: 10s
@@ -100,7 +100,7 @@ services:
100100
- ./Econoris_server:/app/
101101
command: ["npm", "run", "dev"]
102102
tmpfs:
103-
- /tmp:exec,nosuid,nodev
103+
- /tmp:exec,nosuid,nodev,uid=1800,gid=1800
104104
healthcheck:
105105
test: ["CMD-SHELL", "wget -q --spider http://econoris-server:80/ || exit 1"]
106106
interval: 10s
@@ -125,7 +125,7 @@ services:
125125
- ./FlollyList_server:/app/
126126
command: ["npm", "run", "dev"]
127127
tmpfs:
128-
- /tmp:exec,nosuid,nodev
128+
- /tmp:exec,nosuid,nodev,uid=1800,gid=1800
129129
healthcheck:
130130
test: ["CMD-SHELL", "wget -q --spider http://flollylist-server:80/ || exit 1"]
131131
interval: 10s
@@ -196,7 +196,8 @@ services:
196196
- ${FLOWER_GARDEN_APP_PORT:-}:80
197197
user: "1800:1800"
198198
tmpfs:
199-
- /tmp:exec,nosuid,nodev
199+
- /tmp:exec,nosuid,nodev,uid=1800,gid=1800
200+
- /app/${FLOWER_GARDEN_APP_DIR_CACHE_PATH}/:rw,uid=1800,gid=1800
200201

201202

202203
#=========#

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ services:
266266
user: "1800:1800"
267267
tmpfs:
268268
- /tmp:exec,nosuid,nodev,uid=1800,gid=1800
269-
- /app/${FLOWER_GARDEN_DIR_CACHE_PATH}/:rw,uid=1800,gid=1800
269+
- /app/${FLOWER_GARDEN_APP_DIR_CACHE_PATH}/:rw,uid=1800,gid=1800
270270
healthcheck:
271271
test: ["CMD-SHELL", "wget -q --spider http://flower-garden-app:80/ || exit 1"]
272272
interval: 10s

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.2
1+
1.5.3

0 commit comments

Comments
 (0)