dash 3.1.0 → 3.1.2
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.
- checksums.yaml +4 -4
- data/lib/kamal/cli/proxy/reboot.rb +15 -6
- data/lib/kamal/configuration/docs/proxy.yml +1 -1
- data/lib/kamal/configuration/proxy/run.rb +1 -1
- data/lib/kamal/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f055523340c3a10172a6a7b0d701bfa8d7591727005e6bb42b86a1e20feb5cc2
|
|
4
|
+
data.tar.gz: 4b07129c7bb287b216d426137eab83fc438a1ec0bfc2a010ac7333bdae94a75e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ec9eecf2779edb62d27c5bb3cb19b2e9f8febbcacb6f6e65a68d9f83e6f88d71763265c2d32e4612c437242a8a4e5ecd052d21fbd23f91b909bca7e7c2d5fc80
|
|
7
|
+
data.tar.gz: 19a72b9aa01b82a945dcea77a66a9ebeb1145d02e2434a06d43d65b8006b5a7082400f5052c48616ac6b2704399d878a21c036e9e6d618b2052545307e3356a7
|
|
@@ -38,6 +38,7 @@ class Kamal::Cli::Proxy::Reboot
|
|
|
38
38
|
def replace_container
|
|
39
39
|
execute *proxy.ensure_proxy_directory
|
|
40
40
|
execute *proxy.ensure_apps_config_directory
|
|
41
|
+
sync_proxy_secrets
|
|
41
42
|
|
|
42
43
|
if proxy.port_holder?
|
|
43
44
|
replace_generation
|
|
@@ -46,18 +47,26 @@ class Kamal::Cli::Proxy::Reboot
|
|
|
46
47
|
end
|
|
47
48
|
end
|
|
48
49
|
|
|
49
|
-
#
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
# Every replacement path below launches a container that reads
|
|
51
|
+
# --env-file at docker run, so the secrets must be on disk before ANY
|
|
52
|
+
# generation starts. This used to live inside stop_and_replace only, and
|
|
53
|
+
# the port-holder paths launched their generation without it — a
|
|
54
|
+
# port-holder reboot on a host without the file died with
|
|
55
|
+
# "open .kamal/proxy/secrets.env: no such file or directory".
|
|
56
|
+
def sync_proxy_secrets
|
|
55
57
|
if (run_config = proxy.proxy_run_config)&.secrets?
|
|
56
58
|
upload! run_config.secrets_io, run_config.secrets_path, mode: "0600"
|
|
57
59
|
else
|
|
58
60
|
# A host keeps no secrets it no longer needs.
|
|
59
61
|
execute *proxy.remove_proxy_secrets_file, raise_on_non_zero_exit: false
|
|
60
62
|
end
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
# Phase 1 replacement: stop the old container, start the new one. Brief gap.
|
|
66
|
+
def stop_and_replace
|
|
67
|
+
info "Stopping and removing kamal-proxy on #{host}, if running..."
|
|
68
|
+
execute *proxy.stop(timeout: KAMAL.config.drain_timeout + 10), raise_on_non_zero_exit: false
|
|
69
|
+
execute *proxy.remove_container
|
|
61
70
|
|
|
62
71
|
execute *proxy.run(digest: drift.expected_digest)
|
|
63
72
|
end
|
|
@@ -834,7 +834,7 @@ proxy:
|
|
|
834
834
|
# below already embeds its ghcr.io host
|
|
835
835
|
repository: ghcr.io/zoolutions/kamal-proxy # Container repository for the
|
|
836
836
|
# kamal-proxy image (this is the default)
|
|
837
|
-
version: v1.0.0.
|
|
837
|
+
version: v1.0.0.4 # Version tag of the kamal-proxy image to use.
|
|
838
838
|
# Defaults to the minimum version this gem
|
|
839
839
|
# requires - only pin it to roll forward early,
|
|
840
840
|
# never below the default
|
data/lib/kamal/version.rb
CHANGED