Skip to content
Snippets Groups Projects
Unverified Commit 2ee8e074 authored by Quentin Duchemin's avatar Quentin Duchemin
Browse files

Don't mount deleted pads in instances and simplify volumes syntax

parent e8106ca0
No related branches found
No related tags found
1 merge request!57Delete pad after delay
...@@ -31,7 +31,7 @@ networks: ...@@ -31,7 +31,7 @@ networks:
week_app-db: week_app-db:
name: etherpad_week_app-queries-database name: etherpad_week_app-queries-database
#dpad-app: used by the dpad script to query the app via its web API #dpad-app: used by the dpad script to query the app via its web API
standard_dpad-app: standard_dpad-app:
name: etherpad_standard_dpad-queries-app name: etherpad_standard_dpad-queries-app
week_dpad-app: week_dpad-app:
name: etherpad_week-dpad-queries-app name: etherpad_week-dpad-queries-app
...@@ -67,8 +67,7 @@ services: ...@@ -67,8 +67,7 @@ services:
container_name: etherpad_standard_app container_name: etherpad_standard_app
env_file: ./secrets/etherpad-app.secrets env_file: ./secrets/etherpad-app.secrets
volumes: volumes:
- ./settings.json:/opt/etherpad-lite/settings.json - ./settings.json:/opt/etherpad-lite/settings.json:ro
- standard_deleted-pads:/opt/etherpad-lite/deleted_pads
- standard_api-key:/mountedAPIkey - standard_api-key:/mountedAPIkey
command: ["--apikey", "/mountedAPIkey/APIKEY.txt"] command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
labels: labels:
...@@ -98,8 +97,7 @@ services: ...@@ -98,8 +97,7 @@ services:
build: . build: .
env_file: ./secrets/etherpad-week-app.secrets env_file: ./secrets/etherpad-week-app.secrets
volumes: volumes:
- ./settings_week.json:/opt/etherpad-lite/settings.json - ./settings_week.json:/opt/etherpad-lite/settings.json:ro
- week_deleted-pads:/opt/etherpad-lite/deleted_pads
- week_api-key:/mountedAPIkey - week_api-key:/mountedAPIkey
command: ["--apikey", "/mountedAPIkey/APIKEY.txt"] command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
labels: labels:
...@@ -124,20 +122,12 @@ services: ...@@ -124,20 +122,12 @@ services:
restart: unless-stopped restart: unless-stopped
# script COMPLEMENTARY to etherpad plugin ep_delete_after_delay # script COMPLEMENTARY to etherpad plugin ep_delete_after_delay
standard_delete-pad-after-delay: standard_delete-pad-after-delay:
build: build:
context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git
volumes: volumes:
- type: volume - standard_api-key:/mountedAPIkey:ro
source: standard_api-key
target: /mountedAPIkey
read_only: true
volume:
nocopy: true
- standard_deleted-pads:/opt/etherpad-lite/deleted_pads - standard_deleted-pads:/opt/etherpad-lite/deleted_pads
networks: networks:
- standard_dpad-app - standard_dpad-app
...@@ -156,12 +146,7 @@ services: ...@@ -156,12 +146,7 @@ services:
build: build:
context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git
volumes: volumes:
- type: volume - week_api-key:/mountedAPIkey:ro
source: week_api-key
target: /mountedAPIkey
read_only: true
volume:
nocopy: true
- week_deleted-pads:/opt/etherpad-lite/deleted_pads - week_deleted-pads:/opt/etherpad-lite/deleted_pads
networks: networks:
- week_dpad-app - week_dpad-app
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment