consul_stockpile 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59e8e2b4697347d0e8e63c956aac5e4533ae18f
-  data.tar.gz: 5c8e759867192356ac72b0900ec2e16a0e64cd52
+  metadata.gz: c71ceb8d41a9a966491236bcb603a0e077693154
+  data.tar.gz: bc517ed1d50ced593ee03659416a5b9a3f488eb5
 SHA512:
-  metadata.gz: 91fdc2a2413a3f64435266f6a0787aa346980daf3c1ecabd6a8a58016d338329d373c3a6df241703aaef27d7aa67a34cd40c2e785d48f5c61d2bb1ccf04629a3
-  data.tar.gz: e778686e7bca832f2a6acca93c4d3065e5084428dbdd391c419fbcad3abdf03656606b5082d0eb045c54249ceeda76d71a4906f0ddd43b9a895b06d4934df608
+  metadata.gz: 816221a751eb7186ab7a885103662adbda249ad6f9753d3e820466d243171f51f4af40ee94fad1d83c152120914921901b60d23114db0fb79f07da00075ffe9e
+  data.tar.gz: 051d85e6f05557d9093f83d2bce755b878e6481020a3a3cbf8cb6eafa07fd6fb5537a63d07688cf48b3234073aff60712e48ece85f4c50ff2e77569f0a076008

data/Dockerfile.release

@@ -0,0 +1,19 @@
+FROM outstand/ruby-base:2.2.4-alpine
+MAINTAINER Ryan Schlesinger <ryan@outstand.com>
+
+RUN addgroup stockpile && \
+    adduser -S -G stockpile stockpile
+
+ENV CONSUL_STOCKPILE_VERSION=0.1.1
+
+RUN apk --no-cache add libxml2 libxslt \
+    && apk --no-cache add --virtual build-dependencies build-base libxml2-dev libxslt-dev \
+    && gem install nokogiri -- --use-system-libraries \
+    && gem install consul_stockpile -v ${CONSUL_STOCKPILE_VERSION} \
+    && apk del build-dependencies
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+
+ENV DUMB_INIT_SETSID 0
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["consul_stockpile"]

data/README.md

@@ -29,9 +29,10 @@ Or install it yourself as:
 
 To release a new version:
 - Update the version number in `version.rb`
-- Run `docker run -it --rm outstand/consul_stockpile:latest bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-- Run `docker build -t outstand/consul_stockpile:VERSION -f Dockerfile.release .`
-- Run `docker push outstand/consul_stockpile:VERSION`
+- `docker build -t outstand/consul_stockpile .`
+- `docker run -it --rm -v ~/.gitconfig:/consul_stockpile/.gitconfig -v ~/.gitconfig.user:/consul_stockpile/.gitconfig.user -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v ~/.gem:/root/.gem outstand/consul_stockpile rake release`
+- `docker build -t outstand/consul_stockpile:VERSION -f Dockerfile.release .`
+- `docker push outstand/consul_stockpile:VERSION`
 
 ## Contributing
 

data/lib/consul_stockpile/bootstrap_consul_kv.rb

@@ -23,7 +23,7 @@ module ConsulStockpile
         ConsulLock.with_lock(key: LOCK_KEY) do
           if DetectCanary.call.exists
             Logger.info 'Canary detected; skipping bootstrap.'
-            return
+            return OpenStruct.new(ran_bootstrap: false)
           end
 
           json = DownloadBackup.call(bucket: bucket).json_body
@@ -32,6 +32,7 @@ module ConsulStockpile
         end
 
         Logger.info 'Bootstrap complete.'
+        OpenStruct.new(ran_bootstrap: true)
       end
     end
   end

data/lib/consul_stockpile/bootstrap_consul_kv_actor.rb

@@ -15,8 +15,8 @@ module ConsulStockpile
       if message == :bootstrap
         Logger.tagged('Bootstrap') do
           begin
-            BootstrapConsulKV.call(bucket: @bucket)
-            @backup_actor << :backup
+            ran_bootstrap = BootstrapConsulKV.call(bucket: @bucket).ran_bootstrap
+            @backup_actor << :backup if ran_bootstrap
           rescue => e
             Logger.warn "Warning: #{e.message}; retrying in 5 seconds"
             Concurrent::ScheduledTask.execute(5){ tell :bootstrap }

data/lib/consul_stockpile/version.rb

@@ -1,3 +1,3 @@
 module ConsulStockpile
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_stockpile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -216,6 +216,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Dockerfile
+- Dockerfile.release
 - Gemfile
 - README.md
 - Rakefile