orchestration 0.6.10 → 0.6.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f1582f2621a3d1b76eb01abe94e305c9b4e302b0644f923d19ff11731cccdcae
4
- data.tar.gz: 4f33c21464eecbd1bc904bf7f580e0154a4cea20db93b971759380f65e29ce01
3
+ metadata.gz: 60c52d91f6eb17469c4244093217f7c37bdf083bc9b045e175869788178a9196
4
+ data.tar.gz: 2b70b8a444c78beb19ffbf9b2690349e942374c16ca36edecd714f33d798bae0
5
5
  SHA512:
6
- metadata.gz: aa78fcd687d3fd5492588212059db15ba5ff9ee84ec57d5950ed3ae55f01965d6e91133cd4e04049f9256431a39d9918bc61e84ab92f3417be936abfa6f42082
7
- data.tar.gz: 6b1317f6cb99a6c1427e120eb95f23b356c6f7dee2bb8880581b038469eb0a7f2999f2d53cb70bbc79c472794183320faf3c6baa585589cb5ea0a46e490948f3
6
+ metadata.gz: 03efb92b5de3ef15940464ae6e5ba5739c98c4b18d312490f70a497ed0e2fdc2f8094cc482301fe0f81e6667a254fc481783a9f5e349e98a4f0b598d54827640
7
+ data.tar.gz: bbc0087cd77db01f1a87f69222425a91ff2f5f8d204794795b4872d8f5157df208caa05343c5fed67bd1461633baa3aed344ebe2db52a82998932f32c215843a
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- orchestration (0.6.10)
4
+ orchestration (0.6.11)
5
5
  database_url (~> 0.1.2)
6
6
  dotenv-rails (~> 2.8)
7
7
  erubis (~> 2.7)
@@ -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=$(shell echo "${stdout}" | wc -c)
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=$(call println,"$1$(shell head -c ${log_path_length} < /dev/zero | tr '\0' '=')${reset}")
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=env -i \
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 ?= $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo no-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 ?= $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
205
+ git_version := $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
206
206
  else
207
- git_version = dev
207
+ git_version := dev
208
208
  endif
209
209
 
210
- docker_image=${docker_organization}/${docker_repository}:${git_version}
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 = $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
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)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Orchestration
4
- VERSION = '0.6.10'
4
+ VERSION = '0.6.11'
5
5
  end
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.6.10
4
+ version: 0.6.11
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-01-03 00:00:00.000000000 Z
11
+ date: 2023-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: database_url