Skip to content
Snippets Groups Projects
Commit f95909e7 authored by Roma's avatar Roma
Browse files

Trying to pass settings via CMD, not working

parent 05ea69fa
No related branches found
No related tags found
1 merge request!57Delete pad after delay
...@@ -75,5 +75,4 @@ HEALTHCHECK --interval=20s --timeout=3s CMD curl --fail http://localhost:8080 || ...@@ -75,5 +75,4 @@ HEALTHCHECK --interval=20s --timeout=3s CMD curl --fail http://localhost:8080 ||
WORKDIR /opt/etherpad-lite/ WORKDIR /opt/etherpad-lite/
USER etherpad USER etherpad
ENTRYPOINT ["/opt/etherpad-lite/entrypoint.sh"] ENTRYPOINT ["/opt/etherpad-lite/entrypoint.sh", "/bin/bash", "-c", "/opt/etherpad-lite/bin/run.sh" ]
CMD [ "/bin/bash", "-c", "/opt/etherpad-lite/bin/run.sh" ]
...@@ -11,6 +11,10 @@ volumes: ...@@ -11,6 +11,10 @@ volumes:
name: deleted-pads-week name: deleted-pads-week
etherpad-api-key-week: etherpad-api-key-week:
name: etherpad-api-key-week name: etherpad-api-key-week
api-key-standard:
name: etherpad-api-key-standard
api-key-week:
name: etherpad-api-key-week
networks: networks:
...@@ -67,10 +71,11 @@ services: ...@@ -67,10 +71,11 @@ services:
container_name: etherpad-week-app container_name: etherpad-week-app
build: . build: .
env_file: ./secrets/etherpad-week-app.secrets env_file: ./secrets/etherpad-week-app.secrets
command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
volumes: volumes:
- ./settings_week.json:/opt/etherpad-lite/settings.json - ./settings_week.json:/opt/etherpad-lite/settings.json
- deleted-pads-week:/opt/etherpad-lite/deleted_pads - deleted-pads-week:/opt/etherpad-lite/deleted_pads
- /DATA/docker/etherpad/week/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt - api-key-week:/mountedAPIkey
labels: labels:
traefik.http.routers.etherpad-week-app.entrypoints: websecure traefik.http.routers.etherpad-week-app.entrypoints: websecure
traefik.http.routers.etherpad-week-app.rule: Host(`week.pad.picasoft.net`) traefik.http.routers.etherpad-week-app.rule: Host(`week.pad.picasoft.net`)
...@@ -105,13 +110,16 @@ services: ...@@ -105,13 +110,16 @@ services:
etherpad-week-delete-pad-after-delay: etherpad-week-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: bind #we can't use volume for a single file (and we don't want to put the whole /opt/ep on a volume). Make sure that /DATA/docker/... is only accesible by root! This could be improved if APIKEY was stored in a directory. - type: volume
source: /DATA/docker/etherpad/week/APIKEY.txt source: api-key-week
target: /APIKEY.txt target: /mountedAPIkey
read_only: True read_only: true
volume:
nocopy: true
environment: environment:
URL: "https://week.pad.picasoft.net" URL: "https://week.pad.picasoft.net"
DEL: 1209600 #14 days. MUST be COHERENT with settings_week.json ep_delete_after_delay{ DEL: 1209600 #14 days. MUST be COHERENT with settings_week.json ep_delete_after_delay{
DIR: "/opt/etherpad-lite/deleted_pads" DIR: "/opt/etherpad-lite/deleted_pads"
APIKEY_PATH: "/mountedAPIkey/APIKEY.txt"
container_name: etherpad-week-delete-pad-after-delay container_name: etherpad-week-delete-pad-after-delay
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