Merge pull request #183 from anyproto/180-make-cleanetcstorage-does-not-clear-custom-storage-location

fix: respect custom STORAGE_DIR in cleanEtcStorage and tighten volume…

Author: mighty-sponge

Makefile

@@ -49,5 +49,8 @@ restart: down start
 update: pull down start
 upgrade: down clean start
 
+STORAGE_DIR := $(shell grep -m1 '^STORAGE_DIR=' .env 2>/dev/null | cut -d= -f2- | tr -d '"')
+STORAGE_DIR := $(if $(STORAGE_DIR),$(STORAGE_DIR),./storage)
+
 cleanEtcStorage:
-	rm -rf etc/ storage/
+	rm -rf etc/ $(STORAGE_DIR)

docker-compose.yml

@@ -6,7 +6,8 @@ services:
       context: .
       dockerfile: Dockerfile-generateconfig-anyconf
     volumes:
-      - ./:/code:Z
+      - ./.env:/code/.env:ro,Z
+      - ./docker-generateconfig:/code/docker-generateconfig:ro,Z
       - "${STORAGE_DIR}:/code/storage:Z"
 
   # processing any-sync-* configs
@@ -19,7 +20,9 @@ services:
       context: .
       dockerfile: Dockerfile-generateconfig-processing
     volumes:
-      - ./:/code:Z
+      - ./.env:/code/.env:ro,Z
+      - ./docker-generateconfig:/code/docker-generateconfig:ro,Z
+      - ./etc:/code/etc:Z
       - "${STORAGE_DIR}:/code/storage:Z"
 
   mongo-1: