From b6f60a17bf23165b355085b63f879b1949f34888 Mon Sep 17 00:00:00 2001 From: Giles Date: Wed, 19 Aug 2020 21:55:24 +0100 Subject: [PATCH] fix: build and deloy scripts --- build.sh | 1 + deploy.sh | 4 ++++ package.json | 2 -- pull.sh | 1 + push.sh | 1 + yarn.lock | 52 ++++++++++++++++++++++++++++++++++++---------------- 6 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 build.sh create mode 100644 deploy.sh create mode 100644 pull.sh create mode 100644 push.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..569b0cb --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +docker build guacamole-postgresql -t ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..172bacc --- /dev/null +++ b/deploy.sh @@ -0,0 +1,4 @@ +docker stack rm guacamole +echo 'sleeping...zzz' +sleep 60 +docker stack deploy -c docker-compose.yml guacamole diff --git a/package.json b/package.json index 7dd45e8..bcd4be5 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,6 @@ "version": "0.0.3", "description": "remote access", "scripts": { - "build": "sh build.sh", - "deploy": "sh deploy.sh", "release": "standard-version", "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/pull.sh b/pull.sh new file mode 100644 index 0000000..db8971a --- /dev/null +++ b/pull.sh @@ -0,0 +1 @@ +docker pull ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql diff --git a/push.sh b/push.sh new file mode 100644 index 0000000..a8ec2c9 --- /dev/null +++ b/push.sh @@ -0,0 +1 @@ +docker push ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql diff --git a/yarn.lock b/yarn.lock index 50372ee..4e49137 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,23 +23,17 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@sigyl/jsonnet-compose@^0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-compose/-/jsonnet-compose-0.0.2.tgz#8900a21e8cd8109929b6042703f8645aacb9bcda" - integrity sha512-wWS3CgPeNi/o1pcS6n/4pafxlMD0KC9/RKMZr/ySmzeGNRW++sPuKuxajYse2TNd47uNDdeUSnk4aEeEIKL0zA== - -"@sigyl/jsonnet-drone-environment@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" - integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== - -"@sigyl/jsonnet-drone@^0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.0.2.tgz#64572524155eaa2c2b8bda6102f238a0269cafbb" - integrity sha512-1/EZR5Vbo8oKAm+R31XIzsS6VZxcEIcRLyrLi53JQ0+z+CWLPvrUwiq0homBysYJhqk1XRzYF6+ctwbbmmzxrA== +"@babel/runtime@^7.4.5": + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== dependencies: - "@sigyl/jsonnet-compose" "^0.0.2" - "@sigyl/jsonnet-drone-environment" "0.0.5" + regenerator-runtime "^0.13.4" + +"@rbicker/jsonnet@0.1.1-0.12.1": + version "0.1.1-0.12.1" + resolved "https://registry.yarnpkg.com/@rbicker/jsonnet/-/jsonnet-0.1.1-0.12.1.tgz#4d7bf08bed25537b81f3a83aaa22300962ed0f8c" + integrity sha512-G5/t8pf/xqTSDPgRKYoomwR8ql2iZ2G0hzrqv4BxWIizyjiKTPU6V3H/iL7XzOWXbJNEjHHiYdGx3aOOJ2pPfg== "@types/color-name@^1.1.1": version "1.1.1" @@ -205,6 +199,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +commander@2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== + compare-func@^1.3.1: version "1.3.4" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.4.tgz#6b07c4c5e8341119baf44578085bda0f4a823516" @@ -747,6 +746,15 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= +jsonnet-cli@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/jsonnet-cli/-/jsonnet-cli-0.0.3.tgz#d6248c9a8c7fbbb4f02c3ff4300577b99d50a0e1" + integrity sha512-ylICpZamAxVum0Zxt3aoDm4C2qUPFM03Ii9EIl/joZjr6gHdPyxzg245PSRvYbyBsi3YqLAtsrx/3etYWTn+4g== + dependencies: + "@rbicker/jsonnet" "0.1.1-0.12.1" + commander "2.20.0" + yaml "1.6.0" + jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" @@ -1249,6 +1257,11 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" @@ -1573,6 +1586,13 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== +yaml@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.6.0.tgz#d8a985cfb26086dd73f91c637f6e6bc909fddd3c" + integrity sha512-iZfse3lwrJRoSlfs/9KQ9iIXxs9++RvBFVzAqbbBiFT+giYtyanevreF9r61ZTbGMgWQBxAua3FzJiniiJXWWw== + dependencies: + "@babel/runtime" "^7.4.5" + yargs-parser@^18.1.2, yargs-parser@^18.1.3: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"