orchestration 0.7.6 → 0.7.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/orchestration/make/orchestration.mk +8 -8
- data/lib/orchestration/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5c7e9edb1bd0c867ecf0ec2e04843a9088da9094a58db4a5316d232f08852383
|
|
4
|
+
data.tar.gz: de0f1c365a23e2d88ee01f108800801ee261765d756cff2d28bf548d0d3c9c06
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dcd287e55fddb78b737ae52a8c5af3e632c34cb55391aa7ea14593f501c1935e66e9070064c83b251a408326b3f31099b9bcbc3c56f76123e5a3da6e47a4ef02
|
|
7
|
+
data.tar.gz: cf2f763a19c10b0717c2918ebd996371e0b3445db287833b14d66cef07e4737f183692944d5f1b468436fb6775a786a64ad4866ab843e04f9f7009ee3ffb610f
|
data/Gemfile.lock
CHANGED
|
@@ -53,14 +53,14 @@ println=$(call print,$1'\n')
|
|
|
53
53
|
printraw=printf $1
|
|
54
54
|
stdout=${pwd}/log/orchestration.stdout.log
|
|
55
55
|
stderr=${pwd}/log/orchestration.stderr.log
|
|
56
|
-
log_path_length
|
|
56
|
+
log_path_length:=$(shell echo "${stdout}" | wc -c)
|
|
57
57
|
ifndef verbose
|
|
58
58
|
log_tee:= 2>&1 | tee -a ${stdout}
|
|
59
59
|
log:= >>${stdout} 2>>${stderr}
|
|
60
60
|
progress_point:=perl -e 'printf("[${magenta}busy${reset}] "); while( my $$line = <STDIN> ) { printf("."); select()->flush(); }'
|
|
61
61
|
log_progress:= > >(tee -ai ${stdout} >&1 | ${progress_point}) 2> >(tee -ai ${stderr} 2>&1 | ${progress_point})
|
|
62
62
|
endif
|
|
63
|
-
hr
|
|
63
|
+
hr:=$(call println,"$1$(shell head -c ${log_path_length} < /dev/zero | tr '\0' '=')${reset}")
|
|
64
64
|
managed_env_tag:=\# -|- ORCHESTRATION
|
|
65
65
|
standard_env_path:=${pwd}/.env
|
|
66
66
|
backup_env_path:=${pwd}/.env.orchestration.backup
|
|
@@ -190,7 +190,7 @@ else
|
|
|
190
190
|
compose_project_name = ${project_base}
|
|
191
191
|
endif
|
|
192
192
|
|
|
193
|
-
compose_base
|
|
193
|
+
compose_base:=env -i \
|
|
194
194
|
PATH=$(PATH) \
|
|
195
195
|
HOST_UID=$(shell id -u) \
|
|
196
196
|
DOCKER_ORGANIZATION="${docker_organization}" \
|
|
@@ -200,14 +200,14 @@ compose_base=env -i \
|
|
|
200
200
|
docker-compose \
|
|
201
201
|
-f ${orchestration_dir}/docker-compose.${env}.yml
|
|
202
202
|
|
|
203
|
-
git_branch
|
|
203
|
+
git_branch := $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo no-branch))
|
|
204
204
|
ifndef dev
|
|
205
|
-
git_version
|
|
205
|
+
git_version := $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
|
|
206
206
|
else
|
|
207
|
-
git_version
|
|
207
|
+
git_version := dev
|
|
208
208
|
endif
|
|
209
209
|
|
|
210
|
-
docker_image
|
|
210
|
+
docker_image:=${docker_organization}/${docker_repository}:${git_version}
|
|
211
211
|
|
|
212
212
|
compose=${compose_base}
|
|
213
213
|
compose_human=docker-compose -f ${orchestration_dir_name}/docker-compose.${env}.yml
|
|
@@ -315,7 +315,7 @@ db-console:
|
|
|
315
315
|
|
|
316
316
|
.PHONY: setup
|
|
317
317
|
ifneq (,$(wildcard config/database.yml))
|
|
318
|
-
setup: url
|
|
318
|
+
setup: url := $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
|
|
319
319
|
endif
|
|
320
320
|
setup: _log-notify
|
|
321
321
|
@$(call echo,Setting up ${env_human} environment)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: orchestration
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Bob Farrell
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-
|
|
11
|
+
date: 2023-04-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: database_url
|