| Revision | 112691a7cc426dd182a9111a07001a38d97b066c (tree) |
|---|---|
| Time | 2018-05-03 12:43:32 |
| Author | whitestar <whitestar@user...> |
| Commiter | whitestar |
adds the concourse_start script.
cookbooks/concourse-ci/CHANGELOG.md (diff) cookbooks/concourse-ci/recipes/docker-compose.rb (diff) cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_start (diff) cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main (diff) cookbooks/concourse-ci/version (diff)| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | concourse-ci CHANGELOG |
| 2 | 2 | ====================== |
| 3 | 3 | |
| 4 | +0.2.8 | |
| 5 | +----- | |
| 6 | +- adds the `concourse_start` script. | |
| 7 | + | |
| 4 | 8 | 0.2.7 |
| 5 | 9 | ----- |
| 6 | 10 | - adds the `fly_prune_workers_main` script. |
| @@ -310,10 +310,19 @@ template "#{bin_dir}/fly_prune_workers_main" do | ||
| 310 | 310 | mode '0755' |
| 311 | 311 | action :create |
| 312 | 312 | variables( |
| 313 | + basic_auth_username: web_envs_org['CONCOURSE_BASIC_AUTH_USERNAME'], | |
| 313 | 314 | external_url: external_url |
| 314 | 315 | ) |
| 315 | 316 | end |
| 316 | 317 | |
| 318 | +template "#{bin_dir}/concourse_start" do | |
| 319 | + source 'opt/docker-compose/app/concourse/bin/concourse_start' | |
| 320 | + owner 'root' | |
| 321 | + group 'root' | |
| 322 | + mode '0755' | |
| 323 | + action :create | |
| 324 | +end | |
| 325 | + | |
| 317 | 326 | log <<-"EOM" |
| 318 | 327 | Note: You must execute the following command manually. |
| 319 | 328 | See #{doc_url} |
| @@ -0,0 +1,17 @@ | ||
| 1 | +#!/bin/sh | |
| 2 | + | |
| 3 | +PATH=/usr/bin:/bin:/usr/local/bin | |
| 4 | + | |
| 5 | +if [ `whoami` != 'root' ]; then | |
| 6 | + echo 'ERROR: This script requires the root privilege.' >&2 | |
| 7 | + exit 1 | |
| 8 | +fi | |
| 9 | + | |
| 10 | +echo `date '+%Y-%m-%d %H:%M:%S %z'`' Starting Concourse ...' | |
| 11 | + | |
| 12 | +cd <%= node['concourse-ci']['docker-compose']['app_dir'] %> && \ | |
| 13 | +docker-compose down && \ | |
| 14 | +docker-compose up -d && \ | |
| 15 | +./bin/fly_prune_workers_main | |
| 16 | + | |
| 17 | +echo `date '+%Y-%m-%d %H:%M:%S %z'`' Started Concourse.' |
| @@ -1,13 +1,34 @@ | ||
| 1 | -#!/usr/bin/env bash | |
| 1 | +#!/bin/sh | |
| 2 | 2 | |
| 3 | 3 | PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:`dirname $0` |
| 4 | 4 | |
| 5 | +MAX_RETRY=10 | |
| 6 | +RETRY_INTERVAL=10 | |
| 7 | + | |
| 8 | +echo `date '+%Y-%m-%d %H:%M:%S %z'`' fly prune-workers ...' | |
| 9 | + | |
| 5 | 10 | if [ `whoami` != 'root' ]; then |
| 6 | - echo 'ERROR: This script requires the root privilege.' | |
| 11 | + echo 'ERROR: This script requires the root privilege.' >&2 | |
| 7 | 12 | exit 1 |
| 8 | 13 | fi |
| 9 | 14 | |
| 10 | 15 | . <%= node['concourse-ci']['docker-compose']['app_dir'] %>/.env |
| 11 | 16 | |
| 12 | -fly login -t main -u concourse -p $CONCOURSE_BASIC_AUTH_PASSWORD -c <%= @external_url %> | |
| 17 | +for num in `seq 0 ${MAX_RETRY}`; do | |
| 18 | + if [ $num != 0 ]; then | |
| 19 | + echo "Retrying ${num}/${MAX_RETRY}..." | |
| 20 | + fi | |
| 21 | + fly login -t main -u <%= @basic_auth_username %> -p $CONCOURSE_BASIC_AUTH_PASSWORD -c <%= @external_url %> | |
| 22 | + | |
| 23 | + if [ $? -eq 0 ]; then | |
| 24 | + break | |
| 25 | + else | |
| 26 | + if [ $num = $MAX_RETRY ]; then | |
| 27 | + echo 'ERROR: Concourse server connection refused.' >&2 | |
| 28 | + exit 1 | |
| 29 | + fi | |
| 30 | + sleep ${RETRY_INTERVAL}s | |
| 31 | + fi | |
| 32 | +done | |
| 33 | + | |
| 13 | 34 | fly_prune_workers -t main |
| @@ -1 +1 @@ | ||
| 1 | -0.2.7 | |
| 1 | +0.2.8 |
Fork