shippy 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b3f55a1265237768a447d1a0fc8004ce36d4251a29577c04ea4f612e39fc83
-  data.tar.gz: 4687902298d33cd6ed0fc4eb14bb4925b3fda6652af086225ff6eb5114464a0e
+  metadata.gz: 5655cddec8ec27d9507202159d17e8501b7a8d4119857adf2b7b73d2e569fb3c
+  data.tar.gz: 6bba258479efe8243d089b28da0a4b775d1ecbacd6b733f60548f07c99644fa2
 SHA512:
-  metadata.gz: 9252cf785d5e2ead3a4dfda960139b541b90b10f5aa3aa785ad53493c2e2b7964bf6bd59c4229975505c63e230098104ff260660fdb6010d54c698fb7150a591
-  data.tar.gz: 5696767dae26cca80ef8203bb0e6395e9f2baa9618b33b49975318863dbd203277bd2e9591c9f9ee3855ca4facaa9d4359f87f7d53a5725113ac6f85cc29df17
+  metadata.gz: cf0825967db41d98a1ecff981892b39881434f21aa8cd0ed1e9f40d6ee4f056251ed960f53729f235d4794fd165d2df4835692a1159a8cd7fa0d48461187d0ff
+  data.tar.gz: d586a76ec8f0653dae0a95b5c054b6980388921a244d81f0c496eb8e5212a81d0097fcf391ca2bee50807ef4335b4c6434763063cdfc449712c0df03651aadaf

data/lib/shippy/cli/app.rb

@@ -2,10 +2,17 @@ class Shippy::Cli::App < Shippy::Cli::Base
   argument :app_name, type: :string
 
   def initialize(...)
-    super(...)
+    super
     load_app
   end
 
+  desc "compile", "compile application"
+  def compile
+    say "compiling #{app_name} on #{SHIPPY.host}...", :magenta
+
+    SHIPPY.compile
+  end
+
   desc "deploy", "Deploy application"
   def deploy
     say "Deploying #{app_name} on #{SHIPPY.host}...", :magenta

data/lib/shippy/cli/templates/apps/proxy/docker-compose.rb

@@ -1,6 +1,6 @@
 Shippy.define do
   service :proxy do
-    image { "traefik:v2.9" }
+    image { "traefik:v3.5" }
     command { "--configFile=/config/config.yml" }
 
     environment do

data/lib/shippy/compiler.rb

@@ -56,7 +56,7 @@ module Shippy
     def copy_template_files(file)
       new_path = build_dest(file.gsub(".erb", ""))
       mode = File.stat(file).mode
-      template = ERB.new(File.read(file))
+      template = ERB.new(File.read(file), trim_mode: "-")
       result = template.result(app.get_binding)
       File.open(new_path, "wb", mode) { |f| f.write(result) }
     end

data/lib/shippy/service.rb

@@ -1,9 +1,9 @@
 module Shippy
   class Service
     ATTRIBUTES = %i[
-      build command depends_on devices entrypoint environment hostname image
-      labels logging networks user ports restart volumes volumes_from working_dir
-      security_opt
+      build command depends_on devices entrypoint environment extra_hosts hostname
+      image labels logging networks user ports restart volumes volumes_from
+      working_dir security_opt
     ].freeze
 
     attr_reader :name, :app
@@ -56,21 +56,23 @@ module Shippy
       networks { ["lan_access"] }
     end
 
-    def use_traefik(name:, alt: nil, port: nil, healthcheck: false)
+    def use_traefik(name:, alt: nil, port: nil, &block)
       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
+        all_labels += build_traefik_labels(name: name, port: port, &block)
+        all_labels += build_traefik_labels(name: alt, port: port, &block) if alt
 
         all_labels
       end
     end
 
     def build_traefik_labels(name:, port: nil)
+      rule = "Host(`#{name}.#{wildcard_domain}`)"
+      rule = yield(rule) if block_given?
+
       [
-        "traefik.http.routers.websecure-#{name}.rule=Host(`#{name}.#{wildcard_domain}`)",
+        "traefik.http.routers.websecure-#{name}.rule=#{rule}",
         "traefik.http.routers.websecure-#{name}.entrypoints=websecure",
         "traefik.http.routers.websecure-#{name}.tls=true",
         "traefik.http.routers.websecure-#{name}.tls.certresolver=ssl-resolver",
@@ -79,31 +81,16 @@ module Shippy
 
         "traefik.http.routers.web-#{name}.rule=Host(`#{name}.#{wildcard_domain}`)",
         "traefik.http.routers.web-#{name}.entrypoints=web",
-        "traefik.http.routers.web-#{name}.middlewares=secure-redirect-scheme@file",
-
-        "traefik.http.routers.#{name}-local.rule=Host(`#{name}.#{local_domain}`)",
-        "traefik.http.routers.#{name}-local.entrypoints=web",
-        "traefik.http.middlewares.#{name}-local.redirectregex.regex=^http://#{name}.#{local_domain}",
-        "traefik.http.middlewares.#{name}-local.redirectregex.replacement=https://#{name}.#{wildcard_domain}",
-        "traefik.http.middlewares.#{name}-local.redirectregex.permanent=true",
-        "traefik.http.routers.#{name}-local.middlewares=#{name}-local@docker"
+        "traefik.http.routers.web-#{name}.middlewares=secure-redirect-scheme@file"
       ].tap do |labels|
         if port
           labels << "traefik.http.services.#{name}.loadbalancer.server.port=#{port}"
           labels << "traefik.http.routers.websecure-#{name}.service=#{name}"
           labels << "traefik.http.routers.web-#{name}.service=#{name}"
-          labels << "traefik.http.routers.#{name}-local.service=#{name}"
         end
       end
     end
 
-    def build_ihxator_labels(service:)
-      [
-        "ihxator.enable=true",
-        "ihxator.service=#{service}"
-      ]
-    end
-
     def secrets(name)
       @app.secrets(name)
     end

data/lib/shippy/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shippy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Marius Bobin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -148,7 +147,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description:
 email:
 - marius@mbobin.me
 executables:
@@ -187,7 +185,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://mbobin.me/shippy
   source_code_uri: https://mbobin.me/shippy
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Deployment wrapper around docker-compose and SSH Kit
 test_files: []