shippy 0.1.5 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/shippy/cli/app.rb +8 -8
- data/lib/shippy/service.rb +12 -9
- data/lib/shippy/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a4a6c9b5cbe6d6dbe0be267e4e76d4372a6d78d4483c6a3d7721230fd32cd7a8
|
4
|
+
data.tar.gz: 39bf57e4636e6a9343f22f2fc325c4b7d10fc40d10d26b6379cc2cf703cfe019
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c719d505f8e301438aed561fb3f9607a35c979d9c0aa84bcafd0060e831b44e5f698ef0dc334b4a58d4cad06550d67b24c673e05b451b2c4a5da6ee690c0c94d
|
7
|
+
data.tar.gz: 021b75b9ce21f00be9d92577159bed3e584cad3d511c8967496cde6992c1e3ec5110cd805acb1a78814dff2aee878cb3c15c959c7504294154538b2eea787479
|
data/lib/shippy/cli/app.rb
CHANGED
@@ -28,7 +28,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
28
28
|
say "Pulling images for #{app_name} on #{SHIPPY.host}...", :magenta
|
29
29
|
|
30
30
|
within_app do
|
31
|
-
execute :
|
31
|
+
execute :docker, "compose", "pull"
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
@@ -37,7 +37,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
37
37
|
say "Starting #{app_name} on #{SHIPPY.host}...", :magenta
|
38
38
|
|
39
39
|
within_app do
|
40
|
-
execute :
|
40
|
+
execute :docker, "compose", "up", "-d", SHIPPY.app&.deploy_flags
|
41
41
|
end
|
42
42
|
end
|
43
43
|
|
@@ -48,7 +48,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
48
48
|
restart_options = options[:service] ? ["--", options[:service]] : []
|
49
49
|
|
50
50
|
within_app do
|
51
|
-
execute :
|
51
|
+
execute :docker, "compose", "restart", *restart_options
|
52
52
|
end
|
53
53
|
end
|
54
54
|
|
@@ -57,14 +57,14 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
57
57
|
say "Stopping #{app_name} on #{SHIPPY.host}...", :magenta
|
58
58
|
|
59
59
|
within_app do
|
60
|
-
execute :
|
60
|
+
execute :docker, "compose", "down", "--remove-orphans"
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
64
64
|
desc "logs", "Show app logs"
|
65
65
|
def logs
|
66
66
|
within_app do
|
67
|
-
puts capture(:
|
67
|
+
puts capture(:docker, "compose", "logs", verbosity: Logger::INFO)
|
68
68
|
end
|
69
69
|
end
|
70
70
|
|
@@ -73,7 +73,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
73
73
|
say "Status for #{app_name} on #{SHIPPY.host}...", :magenta
|
74
74
|
|
75
75
|
within_app do
|
76
|
-
puts capture(:
|
76
|
+
puts capture(:docker, "compose", "ps", "-a")
|
77
77
|
end
|
78
78
|
end
|
79
79
|
|
@@ -114,7 +114,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
114
114
|
on(SHIPPY.host) do
|
115
115
|
if test("[ -f #{backup_path.join("docker-compose.yml")} ]")
|
116
116
|
within backup_path do
|
117
|
-
execute :
|
117
|
+
execute :docker, "compose", "down", "--remove-orphans"
|
118
118
|
end
|
119
119
|
end
|
120
120
|
end
|
@@ -171,7 +171,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
|
|
171
171
|
|
172
172
|
within_app do
|
173
173
|
SHIPPY.app.each_hook do |service, options, command|
|
174
|
-
execute :
|
174
|
+
execute :docker, "compose", "run", "--rm", options, service, command
|
175
175
|
end
|
176
176
|
end
|
177
177
|
end
|
data/lib/shippy/service.rb
CHANGED
@@ -56,17 +56,18 @@ module Shippy
|
|
56
56
|
networks { ["lan_access"] }
|
57
57
|
end
|
58
58
|
|
59
|
-
def use_traefik(name:, alt: nil, port: nil, healthcheck:
|
59
|
+
def use_traefik(name:, alt: nil, port: nil, healthcheck: false)
|
60
60
|
labels do
|
61
61
|
all_labels = ["traefik.enable=true"]
|
62
|
-
all_labels += build_traefik_labels(name: name, port: port
|
63
|
-
all_labels += build_traefik_labels(name: alt, port: port
|
62
|
+
all_labels += build_traefik_labels(name: name, port: port)
|
63
|
+
all_labels += build_traefik_labels(name: alt, port: port) if alt
|
64
|
+
all_labels += build_ihxator_labels(service: "https://#{name}.#{wildcard_domain}") if healthcheck
|
64
65
|
|
65
66
|
all_labels
|
66
67
|
end
|
67
68
|
end
|
68
69
|
|
69
|
-
def build_traefik_labels(name:, port: nil
|
70
|
+
def build_traefik_labels(name:, port: nil)
|
70
71
|
[
|
71
72
|
"traefik.http.routers.websecure-#{name}.rule=Host(`#{name}.#{wildcard_domain}`)",
|
72
73
|
"traefik.http.routers.websecure-#{name}.entrypoints=websecure",
|
@@ -92,14 +93,16 @@ module Shippy
|
|
92
93
|
labels << "traefik.http.routers.web-#{name}.service=#{name}"
|
93
94
|
labels << "traefik.http.routers.#{name}-local.service=#{name}"
|
94
95
|
end
|
95
|
-
|
96
|
-
if healthcheck
|
97
|
-
labels << "traefik.http.services.#{name}.loadbalancer.healthcheck.path=#{healthcheck}"
|
98
|
-
labels << "traefik.http.services.#{name}.loadbalancer.healthcheck.interval=5s"
|
99
|
-
end
|
100
96
|
end
|
101
97
|
end
|
102
98
|
|
99
|
+
def build_ihxator_labels(service:)
|
100
|
+
[
|
101
|
+
"ihxator.enable=true",
|
102
|
+
"ihxator.service=#{service}"
|
103
|
+
]
|
104
|
+
end
|
105
|
+
|
103
106
|
def secrets(name)
|
104
107
|
@app.secrets(name)
|
105
108
|
end
|
data/lib/shippy/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shippy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1
|
4
|
+
version: 0.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Marius Bobin
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-10-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
202
202
|
- !ruby/object:Gem::Version
|
203
203
|
version: '0'
|
204
204
|
requirements: []
|
205
|
-
rubygems_version: 3.
|
205
|
+
rubygems_version: 3.3.7
|
206
206
|
signing_key:
|
207
207
|
specification_version: 4
|
208
208
|
summary: Deployment wrapper around docker-compose and SSH Kit
|