shiplane 0.1.10 → 0.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/shiplane/deploy/container_configuration.rb +7 -3
  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: 5dd014b07b6b26b1ba78ffc9268899f74769307b0cd7986151b1e0b3ca5d3606
4
- data.tar.gz: 12fde7e3442d5b2715278b902df0283b40f694bf6b8ac47788a75eac480d725d
3
+ metadata.gz: a907afb3787ab25393f794cc4c374a262dcdfc75407da29b13a17f88419baacc
4
+ data.tar.gz: 4634770060492765585b26aa9dde6fa8682909cf424f7444fc34f725da8eacda
5
5
  SHA512:
6
- metadata.gz: c7b152485104d8a716c0b29172a386870f3cfc1224ec3e8ad730cd15da42f7314499cc1d08665528fe89456b88b13b57a3ba106b5eb08663a1acdbcfd75ec988
7
- data.tar.gz: 9ca9e788ef929fb56cc7c2fa873904e6d1feadee447b57f1d8ca2d0d7de39997cd68eb2be20be470394361e3a233618c73e7c7016947132467fdd73baeb63d4d
6
+ metadata.gz: 357e60c9bab455204ea5c9d90e18ee4997e8f278a27b123274ede14ff74a9eb4a1fb8d96cd464e9ca4798267db1b19875da492095448199e12aa877715d50d7c
7
+ data.tar.gz: 270ad92d1b167194af750f9c0aa2ccc785b3203426bd842cd4af6872844c2af735faefe55306e6d53b6460d6c5fe41ea6be98ee04f46c3a70bef1827141f98bf
data/lib/shiplane/deploy/container_configuration.rb CHANGED
@@ -30,7 +30,11 @@ module Shiplane
30
30
  end
31
31
 
32
32
  def container_name
33
- @container_name ||= "#{env.fetch(:application)}_#{name}_#{env.fetch(:sha)}"
33
+ @container_name ||= "#{env.fetch(:application)}_#{name}"
34
+ end
35
+
36
+ def unique_container_name
37
+ @unique_container_name ||= "#{container_name}_#{env.fetch(:sha)}"
34
38
  end
35
39
 
36
40
  def image_name
@@ -68,7 +72,7 @@ module Shiplane
68
72
  "network connect",
69
73
  "--alias #{network_alias}",
70
74
  network,
71
- container_name,
75
+ unique_container_name,
72
76
  "|| true",
73
77
  ].flatten.compact.join(" ")
74
78
  end
@@ -81,7 +85,7 @@ module Shiplane
81
85
  volumes.map{|volume_set| "-v #{volume_set}" },
82
86
  published_ports.map{|port| "--expose #{port} -p #{port}" },
83
87
  exposed_ports.map{|port| "--expose #{port}" },
84
- "--name #{container_name}",
88
+ "--name #{unique_container_name}",
85
89
  virtual_host ? "-e VIRTUAL_HOST=#{virtual_host}" : nil,
86
90
  letsencrypt_host ? "-e LETSENCRYPT_HOST=#{letsencrypt_host}" : nil,
87
91
  letsencrypt_email ? "-e LETSENCRYPT_EMAIL=#{letsencrypt_email}" : nil,
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.1.10"
4
+ VERSION = "0.1.11"
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.1.10
4
+ version: 0.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Epperson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-07 00:00:00.000000000 Z
11
+ date: 2019-07-14 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.1.10
19
+ version: 0.1.11
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.1.10
26
+ version: 0.1.11
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.1.10
33
+ version: 0.1.11
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.1.10
40
+ version: 0.1.11
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: dotenv
43
43
  requirement: !ruby/object:Gem::Requirement