shiplane 0.2.24 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717b27c536b459fbc9676c52301ec0a14a8b2b5073c55523b1905221a11bf8ff
-  data.tar.gz: da11a400c0ce5d089f3789d71912a7b3659c5d18ff3be7ddbe9dcb0fc2d5d3fb
+  metadata.gz: 0b660d6bc4e6cde928618adb491b66efede00531db0b06bd32317a3647e9cde8
+  data.tar.gz: 66f75f91be73bbc26c821cbe4d77f50295193db0b43aeba9ea3536c9da07d692
 SHA512:
-  metadata.gz: ffec7ae7cf7890f24cd4e42b0be1a213b799bca02b23d9773c97ee4622db0581e72379c9b6054c46c5049caa409345f2e36141a5655a19257b9720b234d68b29
-  data.tar.gz: 214127080674ca9eda30be4e55d3525e9b70b96a6ad042bee2d11c03285e23f588704c12014b3ab1cf5825c97b02e86d97c99b089e404ff0046bf669dc786883
+  metadata.gz: 01f14938aaa7dc655b65d1aa0d620dea0fde5eba67aaf377681e7f9ac08167c39d571de4ceac5a40d3774aefddf65ce0bf460d241f87ac3d9d7be4e30d8b2467
+  data.tar.gz: c62b8540dde5cc083c8f9c3fafccf0b2929fe07ad199d3afda93a2fc10844bf7e9333cfe902cebf249eded57ab9b0cdb4031b379fe9df0bb87b6ee013978464f

data/README.md

@@ -138,6 +138,7 @@ DOCKERHUB_USERNAME=XXXXXXXXXX # deprecated but still supported username specific
 SHIPLANE_CONTAINER_REGISTRY_TOKEN=XXXXXXXXXX # Token for container registry authentication
 SHIPLANE_CONTAINER_REGISTRY_USERNAME=XXXXXXXXXX # Username for container registry authentication
 RAISE_EXCEPTIONS_ON_FAILED_BUILD=true # Tells Shiplane to stop on a failed build and raise an exception. Defaults to 'false'
+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
 ```
 ## Important ENVIRONMENT VARIABLES for runtime
 # Rails Environment Variable sample

data/lib/shiplane/build.rb

@@ -188,13 +188,19 @@ module Shiplane
     end
 
     def build_output_image_name(artifact_name)
-      @build_output_image_name ||= "#{appname}-#{sha}_#{artifact_name}:latest"
+      @build_output_image_name ||= "#{appname}-#{sha}#{docker_compose_separator}#{artifact_name}:latest"
     end
 
     def build_cache_option
       ENV['USE_BUILD_CACHE'] == 'true' ? nil : "--no-cache"
     end
 
+    def docker_compose_separator
+      return '_' if ENV['DOCKER_COMPOSE_V1_COMPATIBILITY'] && ENV['DOCKER_COMPOSE_V1_COMPATIBILITY'] == 'true'
+
+      '-'
+    end
+
     # API Helper Methods
     def self.build!(sha, postfix: nil, stage: nil)
       new(sha, postfix: postfix, stage: stage).build!

data/lib/shiplane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shiplane
-  VERSION = "0.2.24"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.26
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shiplane_bootstrappers_chef
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.24
+        version: 0.2.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.24
+        version: 0.2.26
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.24
+        version: 0.2.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.24
+        version: 0.2.26
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement