docker-build 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e48e660810569e7042bdd70441872e8a1239c0
-  data.tar.gz: b59a5093be2d4ef7f56fe5dc570a26e340037327
+  metadata.gz: c01b298aefd260a725ada099c64549de06bb72e9
+  data.tar.gz: 136772c23f5fdecf4beb0591f494fca179a5f56b
 SHA512:
-  metadata.gz: 082810557438576acdcedfc5196deb59f428b4a9bfb1f0d98cd1814de8a1f1445488fa292c71227a359a783076795be8f51b757e56491d72c83963a7d0ccf361
-  data.tar.gz: 8cc9ab966ba0cb3927170c0028b142a5931bbf25fc5d6e350f9dfaa010ecf5456db02d5ceba70e12d699c38e484742be469fb77c7ee364343b7b960b9aca715a
+  metadata.gz: 5bef3e66c3f4d92d5b8df5a60f523d536bcf80f9e2952f9a759fbc7a30003c32598209f03534d22d06d679a41d2820111e42acdb1a79ed649907bf64514903bb
+  data.tar.gz: 3275d18d980191b6ad4ad3b6e6d4207d8c3c27a9da77f1c306572d77f90d9fd3dce3ce319c01f0978a5309cfae6fe0303aa7ecf4aba7f43947f7bf595604161a

data/lib/docker-build.rb

@@ -13,7 +13,7 @@ class DockerBuild
     end
 
     def self.data_container(docker_file_path)
-        command = "docker build #{docker_file_path}"
+        command = "docker build --no-cache #{docker_file_path}"
         output = `#{command}`
 
         puts output

data/lib/docker/google.rb

@@ -1,19 +1,27 @@
 class Google
 
-    def self.tag_container(image_id, repo, project_id)
-        time = Time.new
-        image_timestamp = "#{time.year}-#{time.month}-#{time.day}_#{time.hour}#{time.min}#{time.sec}"
+    def self.tag_container(image_id, repo, project_id, cached=false)
         branch = `git rev-parse --abbrev-ref HEAD`.strip
-        command = "docker tag #{image_id} #{repo}/#{project_id}:#{branch}-latest"
-        puts command
-        system command
-        tag = "#{repo}/#{project_id}:#{branch}-#{image_timestamp}"
+        commit = `git rev-parse --short HEAD`.strip
+        tag = "#{repo}/#{project_id}:#{branch}-#{commit}-"
+        if cached
+            tag << 'cached'
+        else
+            tag << 'uncached'
+        end
         command = "docker tag #{image_id} #{tag}"
         puts command
         system command
         return tag
     end
 
+    def self.tag_latest(image_id, repo, project_id)
+        branch = `git rev-parse --abbrev-ref HEAD`.strip
+        command = "docker tag -f #{image_id} #{repo}/#{project_id}:#{branch}-latest"
+        puts command
+        system command
+    end
+
     def self.push_container(image_tag)
         command = "gcloud preview docker push #{image_tag}"
         fail "Could not push container: #{image_tag}" unless system(command)

data/lib/symfony/symfony.rb

@@ -4,6 +4,12 @@ class Symfony
         Doctrine
     end
 
+    def self.purge_cache(data_container)
+        puts `docker run --rm --volumes-from #{data_container} vjftw/data /bin/bash -l -c "mkdir -p app/cache"`
+        puts `docker run --rm --volumes-from #{data_container} vjftw/data /bin/bash -l -c "rm -rf app/cache/*"`
+        puts `docker run --rm --volumes-from #{data_container} vjftw/data /bin/bash -l -c "chmod -R 777 app/cache"`
+    end
+
     def self.run_command(data_container, command)
         docker_command = "docker run --rm --volumes-from #{data_container} vjftw/php-cli app/console --ansi #{command}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-build
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - VJ Patel