diff --git a/README.md b/README.md index 3717131..88d0b5e 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,16 @@ Upload all changes in storage folder into git repository ## 📁 File system ### fix_permissions + +## 📁 Docker + +### up +run docker-compose containers in demonise + +`--build` - for (re)build containers + +### down +stop docker-compose containers + +## prune +Cleanup Docker diff --git a/package.json b/package.json index fef69f1..257e968 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sscripts", - "version": "1.0.6", + "version": "1.0.7", "description": "Useful Shell scripts for projects", "author": "sHa ", "license": "MIT", @@ -15,7 +15,10 @@ "hello.sh": "./scripts/hello.sh", "hello.js": "./scripts/hello.js", "git.storage_push": "./scripts/git/storage_push.sh", - "fs.fix_permissions": "./scripts/fs/fix_permissions.sh" + "fs.fix_permissions": "./scripts/fs/fix_permissions.sh", + "docker.up": "./scripts/docker/up.sh", + "docker.down": "./scripts/docker/down.sh", + "docker.prune": "./scripts/docker/prune.sh" }, "scripts": { "hello.sh": "./scripts/hello.sh", diff --git a/scripts/docker.up.sh b/scripts/docker.up.sh deleted file mode 100755 index 7948adc..0000000 --- a/scripts/docker.up.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - -docker-compose up -d "$@" diff --git a/scripts/docker/down.sh b/scripts/docker/down.sh new file mode 100755 index 0000000..d66b89c --- /dev/null +++ b/scripts/docker/down.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose down "$@" diff --git a/scripts/docker.down.sh b/scripts/docker/prune.sh similarity index 64% rename from scripts/docker.down.sh rename to scripts/docker/prune.sh index b17b2b2..34ee190 100755 --- a/scripts/docker.down.sh +++ b/scripts/docker/prune.sh @@ -7,4 +7,7 @@ # @link https://shadoll.dev # -docker-compose down "$@" +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +docker system prune -f diff --git a/scripts/docker/up.sh b/scripts/docker/up.sh new file mode 100755 index 0000000..4c2cc67 --- /dev/null +++ b/scripts/docker/up.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose up -d "$@" diff --git a/scripts/fs/fix_permissions.sh b/scripts/fs/fix_permissions.sh index b231333..9dfc566 100755 --- a/scripts/fs/fix_permissions.sh +++ b/scripts/fs/fix_permissions.sh @@ -15,6 +15,6 @@ ROOT=$(cd "$PROJECT"/.. && pwd) sudo chown -R :www-data $ROOT sudo chmod -R g+rwX $ROOT -if [ -d $ROOT/docker/.ssh/]; then +if [ -d $ROOT/docker/.ssh/ ]; then sudo chmod -R a=rwX,go-rwX "$ROOT"/docker/.ssh/ fi