containerci 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308d69ece4c977ad2c95c3572eea0dfbbba58ccf
-  data.tar.gz: 4efab62562715451af5fe4d8098bf54841c5dfe1
+  metadata.gz: 93858c0d6e36c0ef633a539616944fe4509b743d
+  data.tar.gz: 93fcc68718de639b9e620f13b576e4e45832dea9
 SHA512:
-  metadata.gz: 1072683cb94e37691a9b3b2a8426cc2d30262e70c954477bfac762b3b5ea79f09b5e1b61772358e24229763ea00d3585dda4a46c5d82acb6750db0759f715c8c
-  data.tar.gz: 0588b6ac0b5fc61f146ba462a8c982b80072554ac3e181cb72dfd95e11f1a80e579b4bbd941e4d2db1d42ac54402385b4de7adc456bd0e822195edc76aeafa65
+  metadata.gz: 76bf0b9484ab7a0a8c54a005eec9a58402efaea989a44f1c148980d95d90d6ee704eaff7a7ef2820e75c1f8403558481a71023521d4aeed793dc05e2b4da806b
+  data.tar.gz: 6439ed23bfdc3e97257e41c926346073388737a5b07fadafac6aa6517fa7a03f3d25a7b13b344b9048343bae4195db08df12490c79a9cbabc788f8d89ce9a614

data/ChangeLog.md

@@ -9,3 +9,7 @@
 ## Changes since ContainerCI 0.3.0
 
 Fix git commands to handle tags correctly
+
+## Changes since ContainerCI 0.3.1
+
+Improve caching approach.

data/README.md

@@ -103,6 +103,12 @@ task :trigger_next_builds do
 end
 ```
 
+## Caching
+
+ContainerCI takes advantage of the CircleCI cache to avoid rebuilding parts of the image that have not changed.  Pulling images from Docker Hub is expensive; pulling in the cache is less so (but still takes a while!).
+
+If you have made changes early on in your Dockerfile, you'll find that the cache kept by CircleCI is no longer valid--use CircleCI's 'Rebuild without cache' functionality to regenerate the cache based on newer information.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/containerci/version.rb

@@ -1,4 +1,4 @@
 # Rakefile toolkit for creating automated builds for Docker containers.
 module ContainerCI
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/containerci.rb

@@ -48,27 +48,25 @@ module ContainerCI
         puts 'done'
       end
 
-      @dsl.define_task(:restore_cache) do
+      # XXX: I shouldn't save cache again and should instead rely on
+      # me flushing cache every once in a while.  Maybe automate by
+      # looking for cache freshness.
+      @dsl.define_task(:docker_pull) do
+        docker_pull_cmds = 'false; ' \
+           'until [ $? -eq 0 ]; do ' \
+           "docker pull #{USER}/#{PROJECT_NAME}:latest < /dev/null; done"
         puts 'Restoring from docker cache...'
         sh "if [ -e ~/docker/#{PROJECT_NAME}.tar ]; " \
            'then ' \
            '  echo "restoring from cache"; ' \
            "  docker load -i ~/docker/#{PROJECT_NAME}.tar;" \
+           "  #{docker_pull_cmds};" \
+           'else ' \
+           '  echo "recreating cache"; ' \
+           "  #{docker_pull_cmds};" \
+           "  mkdir -p ~/docker; docker save #{USER}/#{PROJECT_NAME}:latest " \
+           "    > ~/docker/#{PROJECT_NAME}.tar; " \
            'fi; '
-        puts 'done'
-      end
-
-      @dsl.define_task(:raw_docker_pull) do
-        puts 'Pulling from dockerhub...'
-        sh 'false; ' \
-           'until [ $? -eq 0 ]; do ' \
-           "docker pull #{USER}/#{PROJECT_NAME}:latest < /dev/null; done"
-        puts 'done'
-      end
-
-      @dsl.define_task(:save_new_cache) do
-        sh "mkdir -p ~/docker; docker save #{USER}/#{PROJECT_NAME}:latest > " \
-           "  ~/docker/#{PROJECT_NAME}.tar"
       end
 
       @dsl.define_task(:get_docker_machine) do
@@ -87,9 +85,6 @@ module ContainerCI
            'fi'
       end
 
-      @dsl.define_task(docker_pull:
-                         [:restore_cache, :raw_docker_pull, :save_new_cache])
-
       @dsl.define_task(dependencies:
                          [:update_github_project,
                           :docker_pull,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: containerci
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Vince Broz