shiplane 0.2.22 → 0.2.23

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/shiplane/deploy/container_configuration.rb +32 -1
  3. data/lib/shiplane/version.rb +1 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: eb6f82b010599d08833c3b9c90201417bc063b535ccce38980abb4346a826518
4
- data.tar.gz: 66ce47268fa66bfa08c363173f3ebe7f36f34aed792fb0484149eb591320f0b9
3
+ metadata.gz: 5f178bde4c806109dddfc3aea8a6b5c333622a2afee77d84fab369d8f1cf06d5
4
+ data.tar.gz: 64b43139fc0312441488282452d571f630f5b4ecf9ab4969df6d51bebb8bd985
5
5
  SHA512:
6
- metadata.gz: 4d58596d12f8d6e163f10cd582050e0017069902fd0b7de2358ac89d80aeba345d26efadc5384ba112b55a263a5c8d068e29bbf01d500a0c9b27314d65f4609f
7
- data.tar.gz: 124cf6fd4913de5dc92c05dd2d92bbd1de1c03e37c5e8e02c4f06f3f1af100562385647f9f746ee9631e2db8c0f37b362c9ef736f2a83342ec88c56440c2b8b8
6
+ metadata.gz: 89f3686c763c9281b262629206f1353e486befbcf8672113f7a359b97d59062105e7dacf06c813714fb83fc67ba65a8e608d315cd434b87e2727db78ee92563a
7
+ data.tar.gz: 524625d5566fd7fbfadc40ab6fa0a3c0409de991ee3428d5d2ce170940a2c0db88581d6d78a2833a60738ea3da60e60c57de8d6ff111910be0e19821faf17e37
data/lib/shiplane/deploy/container_configuration.rb CHANGED
@@ -7,8 +7,39 @@ module Shiplane
7
7
  @network_alias ||= options.fetch(:alias, container_name)
8
8
  end
9
9
 
10
+ def config_volumes
11
+ @config_volumes ||= config_volume_map.select do |config_volume|
12
+ env.fetch(:"#{config_volume[:key]}_mount", true) || env.key?(:"#{config_volume[:key]}_location")
13
+ end.map{|config_volume| "#{env.fetch(:"#{config_volume[:key]}_location", config_volume[:default])}:#{config_volume[:mount_path]}" }
14
+ end
15
+
16
+ def config_volume_map
17
+ {
18
+ proxy_config: {
19
+ key: :proxy_conf_volume,
20
+ default: "/etc/docker/nginx-proxy/proxy.conf",
21
+ mount_path: "/etc/nginx/proxy.conf",
22
+ },
23
+ conf_d_config: {
24
+ key: :conf_d_volume,
25
+ default: "/etc/docker/nginx-proxy/conf.d",
26
+ mount_path: "/etc/nginx/conf.d",
27
+ },
28
+ vhost_d_config: {
29
+ key: :vhost_d_volume,
30
+ default: "/etc/docker/nginx-proxy/vhost.d",
31
+ mount_path: "/etc/nginx/vhost.d",
32
+ },
33
+ share_config: {
34
+ key: :share_volume,
35
+ default: "/etc/docker/nginx-proxy/share",
36
+ mount_path: "/etc/nginx/share",
37
+ },
38
+ }
39
+ end
40
+
10
41
  def volumes
11
- @volumes ||= options.fetch(:volumes, [])
42
+ @volumes ||= options.fetch(:volumes, []).concat(config_volumes).uniq
12
43
  end
13
44
 
14
45
  def published_ports
data/lib/shiplane/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Shiplane
4
- VERSION = "0.2.22"
4
+ VERSION = "0.2.23"
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.22
4
+ version: 0.2.23
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-06-02 00:00:00.000000000 Z
11
+ date: 2022-07-17 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.22
19
+ version: 0.2.23
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.22
26
+ version: 0.2.23
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.22
33
+ version: 0.2.23
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.22
40
+ version: 0.2.23
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: dotenv
43
43
  requirement: !ruby/object:Gem::Requirement