conjur-debify 1.10.3 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d37eadc9ebb56259a7a9fbb811761eb4d9a4210b664b450e5ddcb51e3f5eeb
-  data.tar.gz: 88611983be2c6a1726b54ffac032f95ab3966e3d7cef57e50504fd3c781fce54
+  metadata.gz: 94607aa6690de603becb0143bf6f009089a4c8d43a8380334ba55bd01c97600b
+  data.tar.gz: 5ce55a291b26f7e0164697a9ee20453c194ff3d785e7cb1307cbf313473db46b
 SHA512:
-  metadata.gz: 4be770ae77cf5e80478fb77137b90394086d3bbede9a0d15a61b64b636a6c43ca8e1711e69d7033deb12f0ed13f9609c5c13d1eab4ececfc7a89163a530aa2d7
-  data.tar.gz: 925471e67b930d1fab9cba2484706bea504357fc3dead42cb6c3b2136036cf4ece73092b640b8fef70abf46b84bb7908f0f2189ebef0994171abc06f21d57e32
+  metadata.gz: 1368be6d677fb7ecf73f03f87ecd4b927fa16a561fe9e46a4b1d5c653042a3474697b3428550cb9aab03c3a9bd2baf3caba4929157068bbaaa8832a6f1290bcd
+  data.tar.gz: 248b20b238f67377d926faf920e48c3b676d7ee1389dd813d85a6668404c28daeb8a0d75a37b9d28215089fd70ead5dec7f69e92cded7a54a8cfbd42031010bc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.11.0
+
+* Use a Docker env-file (docker.env, by default) to pass environment
+  variables to the debify container.
+  
+* Make sure `--env` variables get passed along to the Conjur container when testing, too.
+
 # 1.10.3
 
 * Fix a bug causing duplicate files between normal and dev packages when a file name contained a space.

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.2
+FROM ruby:2.6
 
 ### DockerInDocker support is take from
 ### https://github.com/jpetazzo/dind/blob/master/Dockerfile . I
@@ -38,5 +38,7 @@ RUN gem install -N conjur-debify-${VERSION}.gem
 
 ARG CONJUR_APPLIANCE_URL
 ENV CONJUR_APPLIANCE_URL ${CONJUR_APPLIANCE_URL:-https://conjur-master-v2.itp.conjur.net/api}
+ENV CONJUR_ACCOUNT ${CONJUR_ACCOUNT:-conjur}
+ENV CONJUR_VERSION ${CONJUR_VERSION:-4}
 
 ENTRYPOINT ["/debify/distrib/entrypoint.sh"]

data/Jenkinsfile

@@ -38,10 +38,6 @@ pipeline {
     }
 
     stage('Push Docker image') {
-      when {
-        branch 'master'
-      }
-
       steps {
         sh './tag-image.sh'
         sh './push-image.sh'

data/VERSION

@@ -1 +1 @@
-1.10.3
+1.11.1

data/debify.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency "gli"
   spec.add_dependency "docker-api", "~> 1.33"
-  spec.add_dependency "conjur-cli" , "~> 5"
-  spec.add_dependency "conjur-api", "~> 4"
+  spec.add_dependency "conjur-cli" , "~> 6"
+  spec.add_dependency "conjur-api", "~> 5"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "fakefs", "~> 0"

data/image-tags

@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+: ${BRANCH_NAME:=$(git symbolic-ref --short HEAD)}
+
+show_master_tags() {
+  IFS=. read MAJOR MINOR PATCH <VERSION
+  TAG="$MAJOR.$MINOR.$PATCH"
+  echo "latest $TAG $MAJOR.$MINOR"
+}
+
+show_branch_tags() {
+  # tail and tr, to remove the grottiness from the detect-version
+  # output
+  local version="$(DEBIFY_IMAGE=debify:$(<VERSION) ./docker-debify detect-version | tail -1 | tr -d '\r')"
+  
+  echo "$BRANCH_NAME $version"
+}
+
+if [[ "$BRANCH_NAME" == "master" ]]; then
+  show_master_tags
+else
+  show_branch_tags
+fi

data/lib/conjur/debify.rb

@@ -480,7 +480,7 @@ RUN touch /etc/service/conjur/down
           "CONJUR_ENV=appliance",
           "CONJUR_AUTHN_API_KEY=secret",
           "CONJUR_ADMIN_PASSWORD=secret",
-        ],
+        ] + global_options[:env],
         'HostConfig' => {
           'Binds' => [
             [ dir, "/src/#{project_name}" ].join(':')

data/lib/conjur/debify/action/publish.rb

@@ -71,10 +71,10 @@ module Conjur::Debify
         Conjur::Config.apply
         conjur = Conjur::Authn.connect nil, noask: true
 
-        username_var = 'ci/artifactory/users/jenkins/username'
-        password_var = 'ci/artifactory/users/jenkins/password'
-
-        [conjur.variable(username_var).value, conjur.variable(password_var).value]
+        account = Conjur.configuration.account
+        username_var = [account, "variable", "ci/artifactory/users/jenkins/username"].join(':')
+        password_var = [account, "variable", 'ci/artifactory/users/jenkins/password'].join(':')
+        [conjur.resource(username_var).value, conjur.resource(password_var).value]
       end
 
       def publish(options)

data/push-image.sh

@@ -1,9 +1,6 @@
 #!/bin/bash -ex
 
-IFS=. read MAJOR MINOR PATCH <VERSION
-
-TAGS="latest $(docker images --filter reference="registry.tld/conjurinc/debify:$MAJOR.$MINOR*" --format '{{.Tag}}')"
-for t in $TAGS; do
+for t in $(./image-tags); do
   docker push registry.tld/conjurinc/debify:$t
 done
 

data/tag-image.sh

@@ -1,8 +1,6 @@
 #!/bin/bash -ex
 
-IFS=. read MAJOR MINOR PATCH <VERSION
-TAG=$MAJOR.$MINOR.$PATCH
-
-for t in latest $TAG $MAJOR.$MINOR; do
+TAG=$(< VERSION)
+for t in $(./image-tags); do
   docker tag debify:$TAG registry.tld/conjurinc/debify:$t
 done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.11.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - features/support/hooks.rb
 - features/support/world.rb
 - features/test.feature
+- image-tags
 - lib/conjur/debify.rb
 - lib/conjur/debify/Dockerfile.fpm
 - lib/conjur/debify/action/publish.rb
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages