From 46f39f316a73197f71e07b3da1e1fd9c20fcb980 Mon Sep 17 00:00:00 2001 From: isaac-hammes Date: Mon, 21 Aug 2023 12:51:49 -0700 Subject: [PATCH] test --- docker/Gemfile | 4 ++-- docker/Gemfile.lock | 50 +++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..c04b8eb 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,6 +1,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', '~> 3.0' +#gem 'vmpooler', '~> 3.0' gem 'vmpooler-dns-gcp', '~> 1.0' # Remove temporarily until a stable minor release is published # gem 'vmpooler-provider-ec2', '~> 0.0.1' @@ -8,7 +8,7 @@ gem 'vmpooler-provider-gce', '~> 1.0' gem 'vmpooler-provider-vsphere', '~> 3.0' # For development install via a git branch use something like: -# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature' +gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'POD-8' # gem 'vmpooler-dns-gcp', git: 'https://github.com/puppetlabs/vmpooler-dns-gcp.git', branch: 'my-feature' # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature' # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 81f2d72..b95a8a8 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,3 +1,30 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: e8345cb09d564fadc9050da7b6417357ec99773e + branch: POD-8 + specs: + vmpooler (3.4.0) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.23.0) + opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) + opentelemetry-instrumentation-http_client (= 0.22.2) + opentelemetry-instrumentation-redis (= 0.25.3) + opentelemetry-instrumentation-sinatra (= 0.23.2) + opentelemetry-resource_detectors (= 0.24.1) + opentelemetry-sdk (~> 1.3, >= 1.3.0) + pickup (~> 0.0.11) + prometheus-client (>= 2, < 5) + puma (>= 5.0.4, < 7) + rack (>= 2.2, < 4.0) + rake (~> 13.0) + redis (~> 5.0) + sinatra (>= 2, < 4) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + GEM remote: https://rubygems.org/ specs: @@ -145,27 +172,6 @@ GEM tilt (2.2.0) trailblazer-option (0.1.2) uber (0.1.0) - vmpooler (3.4.0) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) - deep_merge (~> 1.2) - net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) - opentelemetry-instrumentation-http_client (= 0.22.2) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.1) - opentelemetry-sdk (~> 1.3, >= 1.3.0) - pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) - rake (~> 13.0) - redis (~> 5.0) - sinatra (>= 2, < 4) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -184,7 +190,7 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) vmpooler-provider-vsphere (~> 3.0)