awes_cli 0.0.2 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb079f9a8b29a88ea4d220f04076cc8bc6c03434c23c047e98219cd0e5ec198a
-  data.tar.gz: 07d110937715ed58cae3ee9483cc8949aff2fc7a9e28bedc51ae181595394273
+  metadata.gz: f592fb11b8a27203b8d6d688db4b7a2b89e2be17d44850a3bf0b360e09a49eb8
+  data.tar.gz: 8c98e882b6ab6b0bb4fcec1cdd84fcc9c3f152018ca2dfa4c9e026cb8adf5d55
 SHA512:
-  metadata.gz: 5880a16f407078757024e55584ffa9f55167189d3eb8ef724188f58f8c32a3672d33ef32382ba8053049a9b8c0a36e25379401d7cdd230a9450d48623bce20ac
-  data.tar.gz: 6e312dde6173811a68ca23550908308a28c8e6e88cc27a674099b1dcb4aa25195ebd4b221fc8676fe6852d5cb5ffa7ea6f510a351a0989e3ad370deca7faac90
+  metadata.gz: 535d02115e845946e825e7ac45113de15927b4c790a8a754e222d201bdb4ae4a8d22edc0098150e9c73ec012ffb79b59de4d8ca205f060efe57d971b66d0811e
+  data.tar.gz: 504489e3f3c1ee620bd2c9fcf93217d49fda51e9d4af8342991b428fae312ac0ac2890823672ba7cdd8a3674c7af5886fceba043efdb417b8c01d5abcfe585ac

data/lib/build_app_image.rb

@@ -19,7 +19,7 @@ class BuildAppImage
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather build [options]"
 
-        opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
+        opts.on("--image-tag IMAGE_TAG", "Addtional Image tag to build [optional]") do |val|
           options[:image_tag] = val
         end
 

data/lib/deploy_config.rb

@@ -119,7 +119,23 @@ class DeployConfig
     end
 
     def validate_image_tag_exists?(image_url)
-      shell_cmd("gcloud container images describe #{image_url}")
+      system("gcloud container images describe #{image_url}")
+    end
+
+    def build_image(image_url, gcr_url, options)
+      commit_image_tag = ENV['CI_COMMIT_SHORT_SHA'] || `git rev-parse --short HEAD`
+      time_image_tag=`TZ=IST-5:30 date +'%Y.%m.%d.%HH.%MM.%SS'`
+      commit_image_url = "#{gcr_url}:#{commit_image_tag}".strip
+      time_image_url = "#{gcr_url}:#{time_image_tag}".strip
+
+      project_id = options[:project_id]
+
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+
+      shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
+
+      shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{image_url}")
+
       image_url
     end
 
@@ -146,12 +162,16 @@ class DeployConfig
 
       gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
 
-      opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
+      # opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
-      image_url = opt_image_url || spec[:image] || "#{gcr_url}:current"
-      validate_image_tag_exists?(image_url)
+      # image_url = opt_image_url || spec[:image] || "#{gcr_url}:current"
+      image_url = "#{gcr_url}:current"
+
+      if !validate_image_tag_exists?(image_url)
+        build_image(image_url, gcr_url, options)
+      end
 
-      yaml_file['$IMAGE_URL'] = image_url
+      yaml_file.gsub(/\$IMAGE_URL/, image_url)
 
       FileUtils.mkdir_p('./tmp')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awes_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.8
 platform: ruby
 authors:
 - Umar Siddiqui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com