shiplane 0.2.25 → 0.2.26

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8acf8ff154f45c0012f3ce9a31f1aeaccdd7c2e4781074d4fab246ba6b12c42f
4
- data.tar.gz: 28713285abac72f776dc4290c4b695fbdf89fb289482521c1c8e948384c49b2c
3
+ metadata.gz: 0b660d6bc4e6cde928618adb491b66efede00531db0b06bd32317a3647e9cde8
4
+ data.tar.gz: 66f75f91be73bbc26c821cbe4d77f50295193db0b43aeba9ea3536c9da07d692
5
5
  SHA512:
6
- metadata.gz: 9a568e180e8e6a4b5137e81600bdd46e0d97d41b5f12c3aee5ed020bc5f73122c3bb173984bf27b248d7d0319850230f45937a91b8219a5855cfc5b583532063
7
- data.tar.gz: 25978bcbc6853a192882f739929880b5dfc5f771ad5fd72605e89d73f60dfab778423fdf02f5e7f0418965a7a8fa3118f3a138d31184517510645f9e741d75a6
6
+ metadata.gz: 01f14938aaa7dc655b65d1aa0d620dea0fde5eba67aaf377681e7f9ac08167c39d571de4ceac5a40d3774aefddf65ce0bf460d241f87ac3d9d7be4e30d8b2467
7
+ data.tar.gz: c62b8540dde5cc083c8f9c3fafccf0b2929fe07ad199d3afda93a2fc10844bf7e9333cfe902cebf249eded57ab9b0cdb4031b379fe9df0bb87b6ee013978464f
data/README.md CHANGED
@@ -138,6 +138,7 @@ DOCKERHUB_USERNAME=XXXXXXXXXX # deprecated but still supported username specific
138
138
  SHIPLANE_CONTAINER_REGISTRY_TOKEN=XXXXXXXXXX # Token for container registry authentication
139
139
  SHIPLANE_CONTAINER_REGISTRY_USERNAME=XXXXXXXXXX # Username for container registry authentication
140
140
  RAISE_EXCEPTIONS_ON_FAILED_BUILD=true # Tells Shiplane to stop on a failed build and raise an exception. Defaults to 'false'
141
+ DOCKER_COMPOSE_V1_COMPATIBILITY=true # Set this if you are using docker-compose or using docker compose in compatibility mode. See this StackOverflow Question for some details: https://stackoverflow.com/questions/69464001/docker-compose-container-name-use-dash-instead-of-underscore
141
142
  ```
142
143
  ## Important ENVIRONMENT VARIABLES for runtime
143
144
  # Rails Environment Variable sample
@@ -188,13 +188,19 @@ module Shiplane
188
188
  end
189
189
 
190
190
  def build_output_image_name(artifact_name)
191
- @build_output_image_name ||= "#{appname}-#{sha}_#{artifact_name}:latest"
191
+ @build_output_image_name ||= "#{appname}-#{sha}#{docker_compose_separator}#{artifact_name}:latest"
192
192
  end
193
193
 
194
194
  def build_cache_option
195
195
  ENV['USE_BUILD_CACHE'] == 'true' ? nil : "--no-cache"
196
196
  end
197
197
 
198
+ def docker_compose_separator
199
+ return '_' if ENV['DOCKER_COMPOSE_V1_COMPATIBILITY'] && ENV['DOCKER_COMPOSE_V1_COMPATIBILITY'] == 'true'
200
+
201
+ '-'
202
+ end
203
+
198
204
  # API Helper Methods
199
205
  def self.build!(sha, postfix: nil, stage: nil)
200
206
  new(sha, postfix: postfix, stage: stage).build!
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Shiplane
4
- VERSION = "0.2.25"
4
+ VERSION = "0.2.26"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shiplane
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.25
4
+ version: 0.2.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Epperson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-22 00:00:00.000000000 Z
11
+ date: 2023-01-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: shiplane_bootstrappers_chef
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.2.25
19
+ version: 0.2.26
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.2.25
26
+ version: 0.2.26
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: shiplane_deployers_capistrano_docker
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.25
33
+ version: 0.2.26
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.2.25
40
+ version: 0.2.26
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: dotenv
43
43
  requirement: !ruby/object:Gem::Requirement