Revert "Use ruby:2.4 as base for fpm image (#26)"

This reverts commit 9385e65.

CHANGELOG.md

@@ -1,7 +1,3 @@
-# 1.10.1
-
-* Update fpm container to use Ruby 2.4, fixes `ruby-xz` dependency
-
 # 1.10.0
 
 * add `--net` support to `test` and `sandbox` subcommands

VERSION

@@ -1 +1 @@
-1.10.1
+1.10.0

lib/conjur/fpm/Dockerfile

@@ -1,24 +1,32 @@
-FROM ruby:2.4
+# Build from the same version of ubuntu as phusion/baseimage
+FROM ubuntu:14.04
 
 RUN apt-get update -y && \
-    apt-get install -y build-essential git libpq5 libpq-dev libffi-dev && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y software-properties-common && \
+    apt-add-repository -y ppa:brightbox/ruby-ng && \
+    apt-get update -y && \
+    apt-get install -y build-essential git libpq5 libpq-dev ruby2.2 ruby2.2-dev libffi-dev
 
+
+# Configure bundler and gem the way the ruby:2.2 Dockerfile does, as of 
+# https://github.com/docker-library/ruby/commit/c88f3a67da720bfa9fb1717960d90fd5db11c757
 ENV BUNDLER_VERSION 1.11.2
-ENV FPM_VERSION 1.9.3
 
-RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm:$FPM_VERSION
+RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm
 
 ENV GEM_HOME /usr/local/bundle
 ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 ENV PATH $BUNDLE_BIN:$PATH
-RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" /src \
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN mkdir /src
+
+ENTRYPOINT [ "/package.sh" ]
+
 COPY debify_utils.sh /
 COPY package.sh      /
 
-ENTRYPOINT [ "/package.sh" ]

secrets.yml

@@ -1,3 +1,3 @@
 # Example of secrets.yml file needed for debify publish
-ARTIFACTORY_USERNAME: !var ci/artifactory/users/jenkins/username
-ARTIFACTORY_PASSWORD: !var ci/artifactory/users/jenkins/password
+ARTIFACTORY_USERNAME: !var artifactory/users/jenkins/username
+ARTIFACTORY_PASSWORD: !var artifactory/users/jenkins/password