shippy 0.1.6 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6045bbdd9f3d3ec7b83b88dc28809c7d3f5391c421b1d8972793e468eb23486
-  data.tar.gz: 63a4e730a4a4637b5d8f4eb13be9330ec6058f622ea17d4bc4cea6e98be26355
+  metadata.gz: d6b3f55a1265237768a447d1a0fc8004ce36d4251a29577c04ea4f612e39fc83
+  data.tar.gz: 4687902298d33cd6ed0fc4eb14bb4925b3fda6652af086225ff6eb5114464a0e
 SHA512:
-  metadata.gz: 1fbee88e84f54ad80aa02e4337586a0f5cba380ec20185e8b3fa45bbcb8ad927accef5e03fdda69b2d61a096d62d544100a51faef78e42ac991e81de217efba8
-  data.tar.gz: bef7b11ba7a7219c229f5da67d3caad8a66405514ed62d5c453051740aa9defe4875597866288b4ab7b7cc6bbd4829bc548b8518d53df863acc16ace04b8649d
+  metadata.gz: 9252cf785d5e2ead3a4dfda960139b541b90b10f5aa3aa785ad53493c2e2b7964bf6bd59c4229975505c63e230098104ff260660fdb6010d54c698fb7150a591
+  data.tar.gz: 5696767dae26cca80ef8203bb0e6395e9f2baa9618b33b49975318863dbd203277bd2e9591c9f9ee3855ca4facaa9d4359f87f7d53a5725113ac6f85cc29df17

data/lib/shippy/cli/app.rb

@@ -28,7 +28,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
     say "Pulling images for #{app_name} on #{SHIPPY.host}...", :magenta
 
     within_app do
-      execute :docker_compose, "pull"
+      execute :docker, "compose", "pull"
     end
   end
 
@@ -37,7 +37,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
     say "Starting #{app_name} on #{SHIPPY.host}...", :magenta
 
     within_app do
-      execute :docker_compose, "up", "-d", SHIPPY.app&.deploy_flags
+      execute :docker, "compose", "up", "-d", SHIPPY.app&.deploy_flags
     end
   end
 
@@ -48,7 +48,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
     restart_options = options[:service] ? ["--", options[:service]] : []
 
     within_app do
-      execute :docker_compose, "restart", *restart_options
+      execute :docker, "compose", "restart", *restart_options
     end
   end
 
@@ -57,14 +57,14 @@ class Shippy::Cli::App < Shippy::Cli::Base
     say "Stopping #{app_name} on #{SHIPPY.host}...", :magenta
 
     within_app do
-      execute :docker_compose, "down", "--remove-orphans"
+      execute :docker, "compose", "down", "--remove-orphans"
     end
   end
 
   desc "logs", "Show app logs"
   def logs
     within_app do
-      puts capture(:docker_compose, "logs", verbosity: Logger::INFO)
+      puts capture(:docker, "compose", "logs", verbosity: Logger::INFO)
     end
   end
 
@@ -73,7 +73,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
     say "Status for #{app_name} on #{SHIPPY.host}...", :magenta
 
     within_app do
-      puts capture(:docker_compose, "ps", "-a")
+      puts capture(:docker, "compose", "ps", "-a")
     end
   end
 
@@ -114,7 +114,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
     on(SHIPPY.host) do
       if test("[ -f #{backup_path.join("docker-compose.yml")} ]")
         within backup_path do
-          execute :docker_compose, "down", "--remove-orphans"
+          execute :docker, "compose", "down", "--remove-orphans"
         end
       end
     end
@@ -171,7 +171,7 @@ class Shippy::Cli::App < Shippy::Cli::Base
 
     within_app do
       SHIPPY.app.each_hook do |service, options, command|
-        execute :docker_compose, "run", "--rm", options, service, command
+        execute :docker, "compose", "run", "--rm", options, service, command
       end
     end
   end

data/lib/shippy/compose.rb

@@ -27,7 +27,6 @@ module Shippy
 
     def to_hash
       data = {}
-      data[:version] = "3"
       data[:services] = services.map(&:to_hash).reduce(:merge)
       data[:volumes] = volumes_hash.presence
       data[:networks] = networks_hash.presence

data/lib/shippy/service.rb

@@ -59,6 +59,7 @@ module Shippy
     def use_traefik(name:, alt: nil, port: nil, healthcheck: false)
       labels do
         all_labels = ["traefik.enable=true"]
+        all_labels += ["traefik.docker.network=lan_access"]
         all_labels += build_traefik_labels(name: name, port: port)
         all_labels += build_traefik_labels(name: alt, port: port) if alt
         all_labels += build_ihxator_labels(service: "https://#{name}.#{wildcard_domain}") if healthcheck

data/lib/shippy/version.rb

@@ -1,3 +1,3 @@
 module Shippy
-  VERSION = "0.1.6"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shippy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.2
 platform: ruby
 authors:
 - Marius Bobin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2025-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Deployment wrapper around docker-compose and SSH Kit