envirobly-orchestra 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a146603656b0f7d989daba62fac148bed321781ad26c5a822da7ec1b75bcc18
-  data.tar.gz: 7c8d3a88177da3422c850bc371c821ced7704413bcfcc5d3b475d7c812939083
+  metadata.gz: 649c4efdb1b871fd9da2d82daee65246626bcade95f6ebe96660e8864c9a1fc3
+  data.tar.gz: 36d68bc5b20e51c7ef1f594fb3b0f31cfeb439b93bfc813bdbaa0af56a50ec3d
 SHA512:
-  metadata.gz: cdfee431c6e723f79c5cfb647104f974cb12ca40b1975bfe1b1c1a43528cf51f84cf7dc110b1bd9549c520cd93f79210be674484787a5b9077bf9b21c407fb72
-  data.tar.gz: d16acac39984a4d0d15dd2de18cf0460c7b1b4973449774a904c87ed521fa89062bd36995b276b532f20bed69148720ee7e95e03ce43d9380896dc09341b77d0
+  metadata.gz: a26add478d2971183ed4dcedc6cec9f8b23aae2cda5682c0fea41d9560a2f0bc2abdd8c1bf05cb56abc48fab65b942e7df220701469dc690a1701fca78ffb1b0
+  data.tar.gz: 646480972fe697e48b5eca15fed1100657a6799adfdcdb710d1675f4fb7f454d97f926ca5b81c76429ebb6efd797c6f0153fd10ae38ba5fb98057eefb204b5f6

data/lib/orchestra/base.rb

@@ -28,14 +28,18 @@ class Orchestra::Base < Thor
     end
 
     def log(text)
-      # Size-based rotated logging: 3 10-megabyte files.
-      @logger ||= Logger.new("/var/log/orchestra.log", 3, 10485760)
+      @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.nil? || stdout_and_err.empty?
 

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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envirobly-orchestra
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor