consul_bridge 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a3236dc1a4f626e3d05b5623cc0ffd8ac68cfc
-  data.tar.gz: 0825eefa1db21df45fb39340275df04e182131fb
+  metadata.gz: 8d5e336fda7af83d8a99256a2f6f9a42d5784d2f
+  data.tar.gz: 178f338bdc1adb7a6de9d2629c6927de690b58c2
 SHA512:
-  metadata.gz: af77e4bf8ddc95fb33b8128647bac7a798c9f62ff608f873495134c4d5dc02b28f2ab9986d8927220a9d1a3d0bd52d0dc48bd512f5c03bb657a7f706f9f89cca
-  data.tar.gz: 2d3f4d36af4dc8b94d1b5a142a0314720ce05a6e7f14a036add11255297ddd15834ff9a4b8a2efac579d2c01cc38773bdf9991c04385cc3476a551ea04ca1e25
+  metadata.gz: 657f2a2491dbe299d2ec49d962e355dcaf9545ed2882e6526d42b2b1b1e0b13501a9f05326c3c6cdcc7d13c97d50388c1ec84b87b7b9553c9ef4e84368b0f92c
+  data.tar.gz: 8a06d20d7e62c518448a77e51c05932d5a82213faa51104177c241790360a4b94e24df0b369efab9af6d433f63e650ba31283162932b3334796d54215c6bd66b

data/Dockerfile

@@ -4,28 +4,15 @@ MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 RUN addgroup bridge && \
     adduser -S -G bridge bridge
 
-ENV CONSUL_BRIDGE_VERSION=0.1.1
-
-# Use this to install an official release
-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_bridge -v ${CONSUL_BRIDGE_VERSION} \
-    && apk del build-dependencies
-
-# Use this to install a development version
-# RUN apk --no-cache add build-base libxml2-dev libxslt-dev
-# COPY Gemfile consul_bridge.gemspec /consul_bridge/
-# COPY lib/consul_bridge/version.rb /consul_bridge/lib/consul_bridge/
-# RUN cd /consul_bridge \
-#     && bundle config build.nokogiri --use-system-libraries \
-#     && bundle install
-# COPY . /consul_bridge/
-# RUN cd /consul_bridge \
-#     && bundle exec rake install
+RUN apk --no-cache add build-base libxml2-dev libxslt-dev
+COPY . /consul_bridge/
+RUN cd /consul_bridge \
+    && bundle config build.nokogiri --use-system-libraries \
+    && bundle install \
+    && bundle exec rake install
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
 ENV DUMB_INIT_SETSID 0
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD []
+CMD ["consul_bridge"]

data/Dockerfile.release

@@ -0,0 +1,19 @@
+FROM outstand/ruby-base:2.2.4-alpine
+MAINTAINER Ryan Schlesinger <ryan@outstand.com>
+
+RUN addgroup bridge && \
+    adduser -S -G bridge bridge
+
+ENV CONSUL_BRIDGE_VERSION=0.1.2
+
+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_bridge -v ${CONSUL_BRIDGE_VERSION} \
+    && apk del build-dependencies
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+
+ENV DUMB_INIT_SETSID 0
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["consul_bridge"]

data/docker-entrypoint.sh

@@ -1,8 +1,12 @@
 #!/bin/dumb-init /bin/sh
 set -e
 
-if [ "$(id -u)" = '0' ] && [ "$1" != 'ash' ]; then
-  exec gosu bridge consul_bridge "$@"
+if consul_bridge help "$1" 2>&1 | grep -q "consul_bridge $1"; then
+  set -- consul_bridge "$@"
+fi
+
+if [ "$1" = 'consul_bridge' ]; then
+  set -- gosu bridge "$@"
 fi
 
 exec "$@"

data/lib/consul_bridge/cli.rb

@@ -4,6 +4,7 @@ module ConsulBridge
   class CLI < Thor
     desc 'version', 'Print out the version string'
     def version
+      require 'consul_bridge/version'
       say ConsulBridge::VERSION.to_s
     end
 

data/lib/consul_bridge/version.rb

@@ -1,3 +1,3 @@
 module ConsulBridge
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul_bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan Schlesinger
@@ -146,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Dockerfile
+- Dockerfile.release
 - Gemfile
 - README.md
 - Rakefile