diff --git a/misc/tools/dicos.sh b/misc/tools/dicos.sh index f8c6c03..820c585 100755 --- a/misc/tools/dicos.sh +++ b/misc/tools/dicos.sh @@ -4,9 +4,7 @@ dicos="$dir/dicos/.env.dicos" # Exporter la variable - while IFS='=' read -r key value; do - export "$key"="$value" - done < $dir/env/.env.merge + export $(grep -v '^#' $dir/env/.env.merge 2>/dev/null| xargs) # Initialisation des tableaux templates=() diff --git a/services/50-ninefolio/dockercompose/dockercompose.yml b/services/50-ninefolio/dockercompose/dockercompose.yml index b2e8773..7356075 100644 --- a/services/50-ninefolio/dockercompose/dockercompose.yml +++ b/services/50-ninefolio/dockercompose/dockercompose.yml @@ -12,5 +12,4 @@ services: volumes: - ./services/50-ninefolio/volume/data/private:/app/uploads - ./services/50-ninefolio/volume/data/public:/app/public/uploads - - ./services/50-ninefolio/volume/data/build:/app/public/build diff --git a/services/50-ninefolio/misc/nine.sh b/services/50-ninefolio/misc/nine.sh index eab19a4..18d97a1 100644 --- a/services/50-ninefolio/misc/nine.sh +++ b/services/50-ninefolio/misc/nine.sh @@ -37,6 +37,7 @@ function destroyninefolio { then EchoRouge "Delete BDD = $NINEFOLIO_SERVICE_NAME" docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $NINEFOLIO_SERVICE_NAME + rm -rf services/50-ninefolio/volume/data fi echo "" diff --git a/services/50-ninefolio/volume/data/public/avatar/admin.jpg b/services/50-ninefolio/volume/data/public/avatar/admin.jpg deleted file mode 100644 index 0fa3174..0000000 Binary files a/services/50-ninefolio/volume/data/public/avatar/admin.jpg and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/avatar/noavatar.png b/services/50-ninefolio/volume/data/public/avatar/noavatar.png deleted file mode 100644 index 6867515..0000000 Binary files a/services/50-ninefolio/volume/data/public/avatar/noavatar.png and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/avatar/system.jpg b/services/50-ninefolio/volume/data/public/avatar/system.jpg deleted file mode 100644 index 4c8a16b..0000000 Binary files a/services/50-ninefolio/volume/data/public/avatar/system.jpg and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/hero/hero.jpg b/services/50-ninefolio/volume/data/public/hero/hero.jpg deleted file mode 100644 index 42c3b75..0000000 Binary files a/services/50-ninefolio/volume/data/public/hero/hero.jpg and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/image/contact.jpg b/services/50-ninefolio/volume/data/public/image/contact.jpg deleted file mode 100644 index fdbc7fc..0000000 Binary files a/services/50-ninefolio/volume/data/public/image/contact.jpg and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/image/link.jpg b/services/50-ninefolio/volume/data/public/image/link.jpg deleted file mode 100644 index e55f312..0000000 Binary files a/services/50-ninefolio/volume/data/public/image/link.jpg and /dev/null differ diff --git a/services/50-ninefolio/volume/data/public/logo/logo.png b/services/50-ninefolio/volume/data/public/logo/logo.png deleted file mode 100644 index dafd6f7..0000000 Binary files a/services/50-ninefolio/volume/data/public/logo/logo.png and /dev/null differ