shiplane 0.2.20 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e673d54a2bcd03b638734aa05a26dcba8927e5cd1666a2db72c15af9a9d2c58
-  data.tar.gz: 0a03a2e3274433448d283f759bfcfc47169f84abaa78461ff326941b51469069
+  metadata.gz: 5f178bde4c806109dddfc3aea8a6b5c333622a2afee77d84fab369d8f1cf06d5
+  data.tar.gz: 64b43139fc0312441488282452d571f630f5b4ecf9ab4969df6d51bebb8bd985
 SHA512:
-  metadata.gz: 0b26b1dd7cf7d5d71b23ed071b8968f81713c45d7109b45e0bdf724e2fadd0b40017cc1641e48cfd721e826c2d100017a84ba9088e804d7146bb6cbc87e627ca
-  data.tar.gz: 35ef36de90463a85c7793e8156dc6bf4414049c1f821b1356b24322b0238c6f528863bbdecc3485d29eacbeaea5b04aa0819fd81433a5295273d09e14806b0b7
+  metadata.gz: 89f3686c763c9281b262629206f1353e486befbcf8672113f7a359b97d59062105e7dacf06c813714fb83fc67ba65a8e608d315cd434b87e2727db78ee92563a
+  data.tar.gz: 524625d5566fd7fbfadc40ab6fa0a3c0409de991ee3428d5d2ce170940a2c0db88581d6d78a2833a60738ea3da60e60c57de8d6ff111910be0e19821faf17e37

data/lib/shiplane/build.rb

@@ -138,7 +138,7 @@ module Shiplane
     end
 
     def docker_config
-      @docker_config ||= YAML.load(File.new(docker_compose_filepath), aliases: true)
+      @docker_config ||= YAML.load(File.new(docker_compose_filepath))
     end
 
     def buildable_artifacts

data/lib/shiplane/compose_hash.rb

@@ -14,7 +14,7 @@ module Shiplane
     end
 
     def compose_hash
-      @compose_hash ||= YAML.load(compose_file, aliases: true)
+      @compose_hash ||= YAML.load(compose_file)
     end
 
     def whitelisted_hash

data/lib/shiplane/configuration.rb

@@ -12,7 +12,7 @@ module Shiplane
     end
 
     def config
-      @config ||= YAML.load_file(shiplane_config_file, aliases: true)
+      @config ||= YAML.load_file(shiplane_config_file)
     end
 
     def build_config

data/lib/shiplane/deploy/container_configuration.rb

@@ -7,8 +7,39 @@ module Shiplane
         @network_alias ||= options.fetch(:alias, container_name)
       end
 
+      def config_volumes
+        @config_volumes ||= config_volume_map.select do |config_volume|
+          env.fetch(:"#{config_volume[:key]}_mount", true) || env.key?(:"#{config_volume[:key]}_location")
+        end.map{|config_volume| "#{env.fetch(:"#{config_volume[:key]}_location", config_volume[:default])}:#{config_volume[:mount_path]}" }
+      end
+
+      def config_volume_map
+        {
+          proxy_config: {
+            key: :proxy_conf_volume,
+            default: "/etc/docker/nginx-proxy/proxy.conf",
+            mount_path: "/etc/nginx/proxy.conf",
+          },
+          conf_d_config: {
+            key: :conf_d_volume,
+            default: "/etc/docker/nginx-proxy/conf.d",
+            mount_path: "/etc/nginx/conf.d",
+          },
+          vhost_d_config: {
+            key: :vhost_d_volume,
+            default: "/etc/docker/nginx-proxy/vhost.d",
+            mount_path: "/etc/nginx/vhost.d",
+          },
+          share_config: {
+            key: :share_volume,
+            default: "/etc/docker/nginx-proxy/share",
+            mount_path: "/etc/nginx/share",
+          },
+        }
+      end
+
       def volumes
-        @volumes ||= options.fetch(:volumes, [])
+        @volumes ||= options.fetch(:volumes, []).concat(config_volumes).uniq
       end
 
       def published_ports

data/lib/shiplane/host.rb

@@ -82,7 +82,7 @@ module Shiplane
     end
 
     def self.config
-      @config ||= YAML.load(File.read(config_filepath), aliases: true)
+      @config ||= YAML.load(File.read(config_filepath))
     end
 
     def self.config_filepath

data/lib/shiplane/version.rb

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

metadata

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