Merge pull request #88 from whatwedo/12-76-system-nuke

fix(system): separate data and config folders

Author: s4mpl3d

commands/_internals/checkProject.sh

@@ -8,6 +8,11 @@ function _checkProject() {
         _logRed "docker-compose.yml not found"
         exit 1
     fi
+    if [ -z $(docker network ls --filter=name=${NETWORK_NAME} -q) ]; then
+        _logRed "dde network not created. Please run dde system:up"
+        exit 1
+    fi
+
     mkdir -p .dde
     cp -R ${ROOT_DIR}/helper/configure-image.sh .dde/configure-image.sh
 }

commands/system/destroy.sh

@@ -5,16 +5,17 @@
 #    system-destroy
 
 function system:destroy() {
+    if [ -z $(docker network ls --filter=name=${NETWORK_NAME} -q) ]; then
+        _logRed "Already destroyed"
+        return 0
+    fi
+
     _logRed "Removing containers"
-    docker rm -f $(docker network inspect -f '{{ range $key, $value := .Containers }}{{ printf "%s\n" $key }}{{ end }}' ${NETWORK_NAME}) &>/dev/null
-    cd ${ROOT_DIR}
-    ${DOCKER_COMPOSE} down --remove-orphans
+    ${DOCKER_COMPOSE} --project-directory ${ROOT_DIR} down --remove-orphans
+    docker rm -f $(docker network inspect -f '{{ range $key, $value := .Containers }}{{ printf "%s\n" $key }}{{ end }}' ${NETWORK_NAME}) &>/dev/null || true
 
-    _logRed "Removing network if created"
-    if [ "$(docker network ls --filter=name=${NETWORK_NAME} -q)" != "" ]; then
-        _logRed "Remove network ${NETWORK_NAME}"
-        docker network rm ${NETWORK_NAME}
-    fi
+    _logRed "Remove network ${NETWORK_NAME}"
+    docker network rm ${NETWORK_NAME}
 
     _logGreen "Finished destroying successfully"
 }

commands/system/nuke.sh

@@ -8,9 +8,13 @@ function system:nuke() {
     _logRed "Removing dde sytem"
     system:destroy
 
+    if [ -z ${DATA_DIR} ]; then
+        _logRed "DATA_DIR is not defined"
+        exit 1
+    fi
+
     _logRed "Removing data"
-    cd ${ROOT_DIR}
-    sudo find ./data/* -maxdepth 1 -not -name .gitkeep -exec rm -rf {} ';'
+    sudo rm -rf ${DATA_DIR}/*
 
     _logGreen "Finished nuking successfully"
 }

…a/reverseproxy/etc/nginx/conf.d/dde.conf …g/reverseproxy/etc/nginx/conf.d/dde.confdata/reverseproxy/etc/nginx/conf.d/dde.conf renamed to config/reverseproxy/etc/nginx/conf.d/dde.conf data/reverseproxy/etc/nginx/conf.d/dde.conf renamed to config/reverseproxy/etc/nginx/conf.d/dde.conf

@@ -26,7 +26,7 @@ services:
             - /var/run/docker.sock:/tmp/docker.sock:ro
             - ./data/reverseproxy/etc/nginx/certs:/etc/nginx/certs:ro
             - ./data/reverseproxy/etc/nginx/vhost.d:/etc/nginx/vhost.d:ro
-            - ./data/reverseproxy/etc/nginx/conf.d/dde.conf:/etc/nginx/conf.d/dde.conf:ro
+            - ./config/reverseproxy/etc/nginx/conf.d/dde.conf:/etc/nginx/conf.d/dde.conf:ro
         hostname: reverseproxy
         domainname: test
         container_name: dde_reverseproxy

docker-compose.yml

@@ -6,6 +6,7 @@ DIR=$1
 VHOST=$2
 
 # Generate
+mkdir -p $DIR
 cd $DIR
 if [ ! -f $VHOST.crt ]; then \
     openssl genrsa -out $VHOST.key 2048 && \