shiplane 0.2.25 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acf8ff154f45c0012f3ce9a31f1aeaccdd7c2e4781074d4fab246ba6b12c42f
-  data.tar.gz: 28713285abac72f776dc4290c4b695fbdf89fb289482521c1c8e948384c49b2c
+  metadata.gz: f9a0a4b3feca2d829d43782111be72f5fe294beca9f176e1d99d67467b819f6b
+  data.tar.gz: 6d4e2040df19626fa869405c30823663d97f0415ed27efd25772b9022691f8c2
 SHA512:
-  metadata.gz: 9a568e180e8e6a4b5137e81600bdd46e0d97d41b5f12c3aee5ed020bc5f73122c3bb173984bf27b248d7d0319850230f45937a91b8219a5855cfc5b583532063
-  data.tar.gz: 25978bcbc6853a192882f739929880b5dfc5f771ad5fd72605e89d73f60dfab778423fdf02f5e7f0418965a7a8fa3118f3a138d31184517510645f9e741d75a6
+  metadata.gz: 3dd8875411035c466d62b107ad7c2cf06c3dfb2f2ea4f35afb0b5757d3e862cc3419a7a68f12e7d07410d15c0dfbc4eec0ae36aaa8f14c9b8238c556c18fd163
+  data.tar.gz: 6a2ad04a745de00813a53f4e70c8badaf00cf8e9c8ea385fcda0a571cc55df87d7ba09980645950c3d8f73b0a2ed92c98be4d379beba3d38f1ca94cef5db86c7

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

@@ -9,7 +9,7 @@ require_relative 'configuration'
 module Shiplane
   class Build
     extend Forwardable
-    attr_accessor :sha, :postfix, :tag_latest, :stage, :build_environment_variables
+    attr_accessor :sha, :postfix, :tag_latest, :stage, :build_environment_variables, :run_folder
 
     delegate %i(build_config project_config build_environment_filepath) => :shiplane_config
 
@@ -18,6 +18,7 @@ module Shiplane
       @tag_latest = tag_latest
       @postfix = postfix
       @stage = stage
+      @run_folder = Dir.pwd
 
       Dotenv.overload File.join(Dir.pwd, build_environment_filepath)
 
@@ -78,7 +79,7 @@ module Shiplane
         '-f',
         docker_compose_filepath,
         '--env-file',
-        build_environment_filepath,
+        File.join(run_folder, build_environment_filepath),
         'build',
         build_cache_option,
         artifact_name,
@@ -126,7 +127,7 @@ module Shiplane
     end
 
     def project_folder
-      @project_folder ||= File.join(Dir.pwd, 'docker_builds', appname, project_folder_name)
+      @project_folder ||= File.join(run_folder, 'docker_builds', appname, project_folder_name)
     end
 
     def shiplane_config
@@ -188,13 +189,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.25"
+  VERSION = "0.2.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.27
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2023-05-01 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.25
+        version: 0.2.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.25
+        version: 0.2.27
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.25
+        version: 0.2.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.25
+        version: 0.2.27
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement