From: Vincent Vanwaelscappel Date: Wed, 22 Nov 2023 11:17:20 +0000 (+0100) Subject: wip #6501 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3d45504a28277b7fd0dcbe30ff24132476153e12;p=fluidbook-toolbox.git wip #6501 @0.25 --- diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index e67f35c35..fa53db1a4 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -97,6 +97,8 @@ services: - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/' # Config - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf' + - # External volume + - 'sshfsusstorage:/application/usstorage:ro' ports: - '37127:80' environment: @@ -169,3 +171,11 @@ networks: fluidbook-processfarm: external: name: fluidbook-processfarm + +volumes: + sshfsusstorage: + driver: ucphhpc/sshfs:latest + driver_opts: + sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data" + allow_other: "" + password: "Qu2E9uq48bBzsqGiZA" diff --git a/.docker/dev/update.sh b/.docker/dev/update.sh index a8c404acb..8c12d9153 100644 --- a/.docker/dev/update.sh +++ b/.docker/dev/update.sh @@ -1,8 +1,11 @@ #!/bin/sh cd /docker/fluidbook-toolbox-dev +docker plugin install ucphhpc/sshfs --grant-all-permissions /home/toolbox/www/scripts/fixrights.sh +chown root:root /home/toolbox/dev/.docker/config/cron/host;ln -sf /home/toolbox/dev/.docker/config/cron/host /etc/cron.d/toolbox-dev docker network create fluidbook-toolbox-dev docker compose down +docker volume rm fluidbook-toolbox-dev_sshfsusstorage docker compose up -d /home/toolbox/www/scripts/fixrights.sh docker exec -it fluidbook-toolbox /application/scripts/update.sh