Merge pull request #49 from puppetlabs/maint-upgrade-jruby-9.3.6

(maint) Upgrade to latest vmpooler with jruby 9.3.6

docker/dev/Dockerfile

@@ -8,14 +8,14 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:9.2-jdk
+FROM jruby:9.3.6-jdk
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make && \
+    apt-get install -y --no-install-recommends make git && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

docker/dev/Dockerfile-aio

@@ -8,7 +8,7 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:9.2.9-jdk
+FROM jruby:9.3.6-jdk
 
 RUN mkdir -p /var/lib/vmpooler
 
@@ -17,7 +17,7 @@ WORKDIR /var/lib/vmpooler
 RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
 
 RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends make redis-server && \
+    apt-get install -y --no-install-recommends make git redis-server && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

docker/prod-all-providers/Dockerfile

@@ -8,7 +8,7 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:9.2-jdk
+FROM jruby:9.3.6-jdk
 
 LABEL org.opencontainers.image.description "VMPooler plus all known providers"
 
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make && \
+    apt-get install -y --no-install-recommends make git && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

docker/prod-all-providers/Gemfile

@@ -1,5 +1,5 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'vmpooler',                    '~> 2.3'
-gem 'vmpooler-provider-vsphere',   '~> 1.5'
+gem 'vmpooler',                    '~> 2.4'
+gem 'vmpooler-provider-vsphere',   '~> 1.6'
 gem 'vmpooler-provider-gce',       '~> 0.3'

docker/prod-all-providers/Gemfile.lock

@@ -9,32 +9,13 @@ GEM
     connection_pool (2.2.5)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    google-apis-compute_v1 (0.39.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-core (0.6.0)
+    faraday-net_http (2.0.3)
+    google-apis-compute_v1 (0.44.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -43,8 +24,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-dns_v1 (0.21.0)
-      google-apis-core (>= 0.5, < 2.a)
+    google-apis-dns_v1 (0.23.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
@@ -69,15 +50,14 @@ GEM
     memoist (0.16.2)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     net-ldap (0.17.1)
     nio4r (2.5.8-java)
-    nokogiri (1.12.5-java)
+    nokogiri (1.13.8-java)
       racc (~> 1.4)
     opentelemetry-api (1.0.2)
-    opentelemetry-common (0.19.3)
+    opentelemetry-common (0.19.6)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.20.1)
       opentelemetry-api (~> 1.0)
@@ -89,25 +69,27 @@ GEM
     opentelemetry-instrumentation-concurrent_ruby (0.19.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.19.0)
-    opentelemetry-instrumentation-http_client (0.19.3)
+    opentelemetry-instrumentation-http_client (0.19.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.19.3)
       opentelemetry-instrumentation-base (~> 0.19.0)
-    opentelemetry-instrumentation-redis (0.21.2)
+    opentelemetry-instrumentation-redis (0.21.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.19.3)
       opentelemetry-instrumentation-base (~> 0.19.0)
     opentelemetry-instrumentation-sinatra (0.19.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.19.3)
       opentelemetry-instrumentation-base (~> 0.19.0)
+    opentelemetry-registry (0.1.0)
+      opentelemetry-api (~> 1.0.1)
     opentelemetry-resource_detectors (0.19.1)
       google-cloud-env
       opentelemetry-sdk
-    opentelemetry-sdk (1.0.2)
+    opentelemetry-sdk (1.1.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.19.3)
-      opentelemetry-instrumentation-base (~> 0.19.0)
+      opentelemetry-registry (~> 0.1)
       opentelemetry-semantic_conventions
     opentelemetry-semantic_conventions (1.8.0)
       opentelemetry-api (~> 1.0)
@@ -119,50 +101,49 @@ GEM
     puma (5.6.4-java)
       nio4r (~> 2.0)
     racc (1.6.0-java)
-    rack (2.2.3.1)
-    rack-protection (2.2.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
     rake (13.0.6)
     rbvmomi (3.0.0)
       builder (~> 3.2)
       json (~> 2.3)
       nokogiri (~> 1.10)
       optimist (~> 3.0)
-    redis (4.6.0)
+    redis (4.7.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.2.5)
     ruby2_keywords (0.0.5)
-    signet (0.16.1)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
     spicy-proton (2.1.14)
       bindata (~> 2.3)
     statsd-ruby (1.5.0)
     thrift (0.16.0)
-    tilt (2.0.10)
+    tilt (2.0.11)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    vmpooler (2.3.0)
+    vmpooler (2.4.0)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.2)
       deep_merge (~> 1.2)
       net-ldap (~> 0.16)
-      nokogiri (~> 1.10)
       opentelemetry-exporter-jaeger (= 0.20.1)
       opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
-      opentelemetry-instrumentation-http_client (= 0.19.3)
-      opentelemetry-instrumentation-redis (= 0.21.2)
+      opentelemetry-instrumentation-http_client (= 0.19.4)
+      opentelemetry-instrumentation-redis (= 0.21.3)
       opentelemetry-instrumentation-sinatra (= 0.19.3)
       opentelemetry-resource_detectors (= 0.19.1)
       opentelemetry-sdk (~> 1.0, >= 1.0.2)
@@ -179,7 +160,7 @@ GEM
       google-apis-compute_v1 (~> 0.14)
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.2.0)
-    vmpooler-provider-vsphere (1.5.0)
+    vmpooler-provider-vsphere (1.6.0)
       rbvmomi (>= 2.1, < 4.0)
     webrick (1.7.0)
     zonefile (1.06)
@@ -188,9 +169,9 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  vmpooler (~> 2.3)
+  vmpooler (~> 2.4)
   vmpooler-provider-gce (~> 0.3)
-  vmpooler-provider-vsphere (~> 1.5)
+  vmpooler-provider-vsphere (~> 1.6)
 
 BUNDLED WITH
-   2.3.16
+   2.3.18

docker/prod-all-providers/update-gemfile-lock.sh

@@ -3,4 +3,4 @@
 docker run -it --rm \
   -v $(pwd):/app \
   $(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \
-  /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && gem update --system 3.2.3 && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
+  /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && gem update --system 3.2.3 && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'

docker/test-all-providers/Dockerfile

@@ -8,7 +8,7 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:9.2-jdk
+FROM jruby:9.3.6-jdk
 
 LABEL org.opencontainers.image.description "VMPooler and known providers pulled directly from Git"
 
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make && \
+    apt-get install -y --no-install-recommends make git && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*