diff --git a/.drone/deploy.sh b/.drone/deploy.sh index 6d287e0..9e20a37 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -1,4 +1,5 @@ -docker stack rm drone -echo 'sleeping...zzz' -sleep 60 -docker stack deploy -c docker-compose.yml drone +export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ +docker stack rm drone \ +&& echo 'sleeping...zzz' \ +&& sleep 60 \ +&& docker stack deploy -c docker-compose.yml drone diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 33286f8..189dd3d 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -15,10 +15,10 @@ local config = { config { script: 'sh .drone/scripts/initialise-images.sh', secrets: [ - 'REGISTRY_PASSWORD', 'REGISTRY_DOMAIN', 'REGISTRY_PORT', - ] + 'REGISTRY_PASSWORD' + ], }, ) { trigger +: { diff --git a/.drone/package.json b/.drone/package.json index 33fb902..0f0cc55 100644 --- a/.drone/package.json +++ b/.drone/package.json @@ -4,6 +4,6 @@ "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" }, "dependencies": { - "@sigyl/jsonnet-drone": "^0.3.0" + "@sigyl/jsonnet-drone": "^0.3.1" } } diff --git a/.drone/scripts/initialise-image.sh b/.drone/scripts/initialise-image.sh index 0aaac25..fcc8014 100644 --- a/.drone/scripts/initialise-image.sh +++ b/.drone/scripts/initialise-image.sh @@ -5,12 +5,12 @@ do && docker tag $2 $1$2 \ && docker push $1$2 && break # substitute your command here n=$((n+1)) - if [ $n -ge 2 ]; then + if [ $n -ge 10 ]; then echo "initialise failed" exit 1 fi echo "retrying..$n" - sleep 1 + sleep 5 done diff --git a/.drone/scripts/login.sh b/.drone/scripts/login.sh index b885720..8f7c85e 100644 --- a/.drone/scripts/login.sh +++ b/.drone/scripts/login.sh @@ -5,10 +5,10 @@ do && break # substitute your command here n=$((n+1)) - if [ $n -ge 2 ]; then + if [ $n -ge 10 ]; then echo "login failed" exit 1 fi echo "retrying login..$n" - sleep 1 + sleep 5 done diff --git a/CHANGELOG.md b/CHANGELOG.md index 426d9ba..4ec6049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.0.10](https://sigyl.com///compare/v0.0.9...v0.0.10) "chore(release): 0.0.10" (2020-09-24) + + +### Bug Fixes + +* retries only 10 times ([fc63973](https://sigyl.com///commit/fc6397378f786b5ca8f80aae60775d2c4600d727)) + ### [0.0.9](https://sigyl.com///compare/v0.0.8...v0.0.9) "chore(release): 0.0.9" (2020-09-24) diff --git a/package.json b/package.json index e9d1e7a..63bf96a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "drone", - "version": "0.0.9", + "version": "0.0.10", "description": "drone ci", "scripts": { "deploy": "sh deploy.sh",