From 63b9b8cb7709be7f29dd6e4501c91eb9f37ca3de Mon Sep 17 00:00:00 2001 From: whitestar Date: Wed, 2 May 2018 15:37:17 +0900 Subject: [PATCH] adds the `fly_prune_workers_main` script. --- cookbooks/concourse-ci/CHANGELOG.md | 4 ++++ cookbooks/concourse-ci/concourse.yml | 4 ++-- cookbooks/concourse-ci/recipes/docker-compose.rb | 14 +++++++++++++- .../app/concourse/bin/fly_prune_workers_main | 13 +++++++++++++ .../templates/default/usr/local/bin/fly_prune_workers | 2 +- cookbooks/concourse-ci/version | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main diff --git a/cookbooks/concourse-ci/CHANGELOG.md b/cookbooks/concourse-ci/CHANGELOG.md index 06cca1b..a01c7ce 100644 --- a/cookbooks/concourse-ci/CHANGELOG.md +++ b/cookbooks/concourse-ci/CHANGELOG.md @@ -1,6 +1,10 @@ concourse-ci CHANGELOG ====================== +0.2.7 +----- +- adds the `fly_prune_workers_main` script. + 0.2.6 ----- - fixes format version detection of a local `docker-compose.yml`. diff --git a/cookbooks/concourse-ci/concourse.yml b/cookbooks/concourse-ci/concourse.yml index 91d6537..77387a6 100644 --- a/cookbooks/concourse-ci/concourse.yml +++ b/cookbooks/concourse-ci/concourse.yml @@ -1,5 +1,5 @@ --- -# $ fly -t target sp -p concourse-ci-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml +# $ fly -t $CC_TARGET sp -p concourse-ci-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml resources: - name: src-git type: git @@ -21,7 +21,7 @@ resources: ca_certs: - domain: ((registry-mirror-domain)) # e.g. registry.docker.example.com:5000 cert: ((docker-reg-ca-cert)) - check_every: 12h # default: 1m + check_every: 6h # default: 1m jobs: - name: test-cookbook diff --git a/cookbooks/concourse-ci/recipes/docker-compose.rb b/cookbooks/concourse-ci/recipes/docker-compose.rb index a4960cf..9a9a3ac 100644 --- a/cookbooks/concourse-ci/recipes/docker-compose.rb +++ b/cookbooks/concourse-ci/recipes/docker-compose.rb @@ -202,7 +202,8 @@ unless oauth_client_secret_vault_item.empty? end external_url = web_envs_org['CONCOURSE_EXTERNAL_URL'] -web_envs['CONCOURSE_EXTERNAL_URL'] = "http://#{node['ipaddress']}:8080" if external_url.nil? +external_url = "http://#{node['ipaddress']}:8080" if external_url.nil? +web_envs['CONCOURSE_EXTERNAL_URL'] = external_url data_source = web_envs_org['CONCOURSE_POSTGRES_DATA_SOURCE'] # for backward compatibility. @@ -302,6 +303,17 @@ template config_file do mode '0600' end +template "#{bin_dir}/fly_prune_workers_main" do + source 'opt/docker-compose/app/concourse/bin/fly_prune_workers_main' + owner 'root' + group 'root' + mode '0755' + action :create + variables( + external_url: external_url + ) +end + log <<-"EOM" Note: You must execute the following command manually. See #{doc_url} diff --git a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main new file mode 100644 index 0000000..c498436 --- /dev/null +++ b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:`dirname $0` + +if [ `whoami` != 'root' ]; then + echo 'ERROR: This script requires the root privilege.' + exit 1 +fi + +. <%= node['concourse-ci']['docker-compose']['app_dir'] %>/.env + +fly login -t main -u concourse -p $CONCOURSE_BASIC_AUTH_PASSWORD -c <%= @external_url %> +fly_prune_workers -t main diff --git a/cookbooks/concourse-ci/templates/default/usr/local/bin/fly_prune_workers b/cookbooks/concourse-ci/templates/default/usr/local/bin/fly_prune_workers index f7e849f..53aec1b 100644 --- a/cookbooks/concourse-ci/templates/default/usr/local/bin/fly_prune_workers +++ b/cookbooks/concourse-ci/templates/default/usr/local/bin/fly_prune_workers @@ -5,7 +5,7 @@ PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:`dirname $0` target='' usage() { - echo 'Usage: prune_workers -t target' + echo 'Usage: prune_workers -t $CC_TARGET' echo echo "Options:" echo " -h: this help." diff --git a/cookbooks/concourse-ci/version b/cookbooks/concourse-ci/version index 53a75d6..b003284 100644 --- a/cookbooks/concourse-ci/version +++ b/cookbooks/concourse-ci/version @@ -1 +1 @@ -0.2.6 +0.2.7 -- 2.11.0