diff --git a/medicine/docker-compose.yml b/medicine/docker-compose.yml index d40146a..9f9546e 100644 --- a/medicine/docker-compose.yml +++ b/medicine/docker-compose.yml @@ -1,5 +1,5 @@ -version: '3' +version: '3.4' services: @@ -16,6 +16,7 @@ services: - "${NGINX_HTTPS_PORT:-443}:443" volumes: - medicine-public-data:/app/public + - medicine-files:/app/public/media/files networks: - medicine-network extra_hosts: @@ -56,6 +57,8 @@ services: volumes: medicine-public-data: + medicine-files: + name: medicine-files networks: medicine-network: diff --git a/thirdparty-apps/docker-compose.yml b/thirdparty-apps/docker-compose.yml index 295c5cd..e8c3889 100644 --- a/thirdparty-apps/docker-compose.yml +++ b/thirdparty-apps/docker-compose.yml @@ -32,12 +32,7 @@ services: volumes: - filebrowser-data:/etc - ../volumes/files:/srv/volumes - - type: volume - source: medicine_medicine-public-data - target: /srv/medicine-files - volume: - nocopy: true - subpath: media/files + - medicine-files:/srv/medicine-files networks: - medicine-network logging: @@ -75,7 +70,7 @@ services: volumes: pgadmin-data: filebrowser-data: - medicine_medicine-public-data: + medicine-files: external: true networks: diff --git a/update_repository.sh b/update_repository.sh index 7fd0bd3..7f50a4e 100755 --- a/update_repository.sh +++ b/update_repository.sh @@ -2,7 +2,3 @@ SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" (cd $SCRIPT_PATH && git pull) - -docker pull docker.med-logic.ru/busybox:latest -docker tag docker.med-logic.ru/busybox:latest busybox-local:latest -docker run --rm -v medicine_medicine-public-data:/app busybox-local sh -c "mkdir -p /app/media/files"