envirobly-orchestra 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27540543de48daec3396d69ad5ce05079fefd25a0f76a092c914a8e2873a80e7
-  data.tar.gz: 96d0c5e27e028b8c0cc06df90c81bc111a5efe4d591c1926d201773443bc9e11
+  metadata.gz: 649c4efdb1b871fd9da2d82daee65246626bcade95f6ebe96660e8864c9a1fc3
+  data.tar.gz: 36d68bc5b20e51c7ef1f594fb3b0f31cfeb439b93bfc813bdbaa0af56a50ec3d
 SHA512:
-  metadata.gz: 803c22a7247aa5e69a133436924146cb94d2d7d7f56258e446154fac304fcfdba4d4b60f84a1b9407af1505d12eb40946bb515ce19f1a6354b6ae73f178fc82a
-  data.tar.gz: d16b2d572fbb2acd1357c733af6083ea5020cc82eee376c771ffcab3ec5a795bccd9cb948f558247fcec5c27e02950a44add0d7247d0f497da8bb1f856d6bb55
+  metadata.gz: a26add478d2971183ed4dcedc6cec9f8b23aae2cda5682c0fea41d9560a2f0bc2abdd8c1bf05cb56abc48fab65b942e7df220701469dc690a1701fca78ffb1b0
+  data.tar.gz: 646480972fe697e48b5eca15fed1100657a6799adfdcdb710d1675f4fb7f454d97f926ca5b81c76429ebb6efd797c6f0153fd10ae38ba5fb98057eefb204b5f6

data/lib/orchestra/base.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "logger"
 
 class Orchestra::Base < Thor
   def self.exit_on_failure?
@@ -27,13 +28,20 @@ class Orchestra::Base < Thor
     end
 
     def log(text)
-      Orchestra::Logger.instance.log "inv-#{Thread.current[:invocation]} #{text}"
+      @logger ||= Logger.new("/var/log/orchestra.log")
+
+      @logger.info text
     end
 
-    def execute(cmd, exit_on_failure: true)
-      stdout_and_err, status = Open3.capture2e *cmd
+    def execute(cmd, exit_on_failure: true, escape_arguments: true)
+      stdout_and_err, status =
+        if escape_arguments
+          Open3.capture2e *cmd
+        else
+          Open3.capture2e cmd.join(" ")
+        end
 
-      log stdout_and_err unless stdout_and_err.blank?
+      log stdout_and_err unless stdout_and_err.nil? || stdout_and_err.empty?
 
       if exit_on_failure && status.to_i > 0
         exit 1

data/lib/orchestra/cli/images.rb

@@ -6,30 +6,27 @@ class Orchestra::Cli::Images < Orchestra::Base
   desc "build", "Build and push a Docker image"
   method_option :git_url,         type: :string, required: true
   method_option :commit_id,       type: :string, required: true
-  method_option :cache_bucket,    type: :string, required: true
-  method_option :cache_region,    type: :string, required: true
   method_option :image_uri,       type: :string, required: true
   method_option :dockerfile,      type: :string, required: true
   method_option :build_context,   type: :string, required: true
   def build
-    status = 1
-
-    puts "Checking out commit #{options.commit_id}..."
+    log "Checking out commit #{options.commit_id}..."
 
     checkout_time = Benchmark.realtime do
-      output, status =
-        Open3.capture2e "envirobly-git-checkout-commit", git_checkout_path.to_s, options.git_url, options.commit_id
-
-      puts output
+      execute git_checkout_cmd, escape_arguments: false
     end
 
-    puts "Checkout finished in #{checkout_time.to_i}s\n"
+    log "Checkout finished in #{checkout_time.to_i}s\n"
 
-    $stdout.flush
+    build_time = Benchmark.realtime do
+      execute buildx_build_cmd, escape_arguments: false
+    end
 
-    exit 1 if status.to_i > 0
+    log "Build finished in #{build_time.to_i}s"
 
-    exec *buildx_build_cmd
+    if FileUtils.rm_rf git_checkout_path
+      log "Removed #{git_checkout_path}"
+    end
   end
 
   private
@@ -37,16 +34,16 @@ class Orchestra::Cli::Images < Orchestra::Base
       [
         "docker", "buildx", "build",
         "--progress=plain",
-        "--cache-from=type=s3,region=#{options.cache_region},bucket=#{options.cache_bucket},name=app",
-        "--cache-to=type=s3,region=#{options.cache_region},bucket=#{options.cache_bucket},name=app,mode=max",
-        "-t", options.image_uri, "--push",
+        "--push",
+        "-t", options.image_uri,
         "-f", dockerfile_path.to_s,
-        build_context.to_s
+        build_context.to_s,
+        ">> /var/log/orchestra.log 2>&1"
       ]
     end
 
     def git_checkout_path
-      Pathname.new "/tmp/build"
+      Pathname.new "/tmp/build-#{options.commit_id}"
     end
 
     def build_context
@@ -56,4 +53,14 @@ class Orchestra::Cli::Images < Orchestra::Base
     def dockerfile_path
       git_checkout_path.join options.dockerfile
     end
+
+    def git_checkout_cmd
+      [
+        "envirobly-git-checkout-commit",
+        git_checkout_path.to_s,
+        options.git_url,
+        options.commit_id,
+        "&> /dev/null"
+      ]
+    end
 end

data/lib/orchestra/cli/services.rb

@@ -1,6 +1,8 @@
 require "open3"
 # require "httpx"
 require "pathname"
+require "yaml"
+require "erb"
 
 class Orchestra::Cli::Services < Orchestra::Base
   desc "up", "Start services based on config synced from config bucket"
@@ -99,7 +101,7 @@ class Orchestra::Cli::Services < Orchestra::Base
 
     def initialize_data_volumes
       compose_definition["services"].each do |_, service|
-        next if service.dig("labels", "envirobly.data-volume.pool").blank?
+        next unless service["labels"]
 
         zpool              = service["labels"]["envirobly.data-volume.pool"]
         mountpoint         = service["labels"]["envirobly.data-volume.pool.mountpoint"]
@@ -107,6 +109,8 @@ class Orchestra::Cli::Services < Orchestra::Base
         dataset_mountpoint = service["labels"]["envirobly.data-volume.dataset.mountpoint"]
         device             = service["labels"]["envirobly.data-volume.device"]
 
+        next if zpool.nil? || mountpoint.nil? || zfs_dataset.nil? || dataset_mountpoint.nil? || device.nil?
+
         if zfs_dataset_exist?(zfs_dataset)
           log " ZFS dataset exists"
           next

data/lib/orchestra/cli/stack.rb

@@ -1,6 +1,10 @@
 class Orchestra::Cli::Stack < Orchestra::Base
   desc "prune", "Stop inactive services and clean up their data volumes"
   def prune
+    # Get running containers:
+    # curl -s --unix-socket /var/run/docker.sock "http://localhost/v1.43/containers/json"
+
+    # Actual "prune":
     # docker compose up -d --quiet-pull --no-recreate --remove-orphans --no-start
   end
 end

data/lib/orchestra/logger.rb

@@ -1,5 +1,6 @@
 require "singleton"
 
+# @deprecated in favor of Ruby's Logger
 class Orchestra::Logger
   include Singleton
 

data/lib/orchestra/version.rb

@@ -1,3 +1,3 @@
 module Orchestra
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/lib/orchestra.rb

@@ -1,8 +1,8 @@
 module Orchestra
 end
 
-require "active_support"
-require "active_support/core_ext"
+# require "active_support"
+# require "active_support/core_ext"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: envirobly-orchestra
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement