Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(RE-15161) Bump jruby to 9.4.1.0 and remove tcpsocket usage #97

Merged
merged 2 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# RUN:
# docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler

FROM jruby:9.3.6-jdk
FROM jruby:9.4.1.0-jdk11

LABEL org.opencontainers.image.description "VMPooler plus all known providers"

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Then change directory into vmpooler-projects and build with:


FROM amd64/jruby:9.3.6-jdk
FROM jruby:9.4.1.0-jdk11

LABEL org.opencontainers.image.description "VMPooler plus all known providers"

Expand Down
6 changes: 3 additions & 3 deletions docker/Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

gem 'vmpooler', '~> 2.4'
gem 'vmpooler', '~> 2.5'
# Remove temporarily until a stable minor release is published
# gem 'vmpooler-provider-ec2', '~> 0.0.1'
gem 'vmpooler-provider-gce', '~> 0.4'
gem 'vmpooler-provider-vsphere', '~> 2.0'
gem 'vmpooler-provider-gce', '~> 0.5'
gem 'vmpooler-provider-vsphere', '~> 2.1'

# For development install via a git branch use something like:
# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature'
Expand Down
63 changes: 23 additions & 40 deletions docker/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,19 @@ GEM
specs:
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
aws-eventstream (1.2.0)
aws-partitions (1.701.0)
aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.361.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
bindata (2.4.14)
bindata (2.4.15)
builder (3.2.4)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
connection_pool (2.3.0)
declarative (0.0.20)
deep_merge (1.2.2)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
google-apis-compute_v1 (0.60.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.10.0)
google-apis-compute_v1 (0.63.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -36,8 +24,8 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-dns_v1 (0.29.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-dns_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
Expand All @@ -48,7 +36,7 @@ GEM
zonefile (~> 1.04)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-errors (1.3.1)
googleauth (1.2.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
Expand All @@ -57,18 +45,16 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3-java)
jwt (2.6.0)
jwt (2.7.0)
memoist (0.16.2)
mini_mime (1.1.2)
multi_json (1.15.0)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
net-ldap (0.17.1)
net-ssh (7.0.1)
nio4r (2.5.8-java)
nokogiri (1.13.10-java)
nokogiri (1.14.2-java)
racc (~> 1.4)
opentelemetry-api (1.1.0)
opentelemetry-common (0.19.6)
Expand Down Expand Up @@ -115,7 +101,7 @@ GEM
puma (5.6.5-java)
nio4r (~> 2.0)
racc (1.6.2-java)
rack (2.2.6.2)
rack (2.2.6.3)
rack-protection (2.2.4)
rack
rake (13.0.6)
Expand All @@ -124,7 +110,7 @@ GEM
json (~> 2.3)
nokogiri (~> 1.12, >= 1.12.5)
optimist (~> 3.0)
redis (4.8.0)
redis (4.8.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand All @@ -145,11 +131,11 @@ GEM
spicy-proton (2.1.15)
bindata (~> 2.3)
statsd-ruby (1.5.0)
thrift (0.17.0)
tilt (2.0.11)
thrift (0.18.1)
tilt (2.1.0)
trailblazer-option (0.1.2)
uber (0.1.0)
vmpooler (2.4.0)
vmpooler (2.5.0)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.2)
deep_merge (~> 1.2)
Expand All @@ -170,27 +156,24 @@ GEM
sinatra (~> 2.0)
spicy-proton (~> 2.1)
statsd-ruby (~> 1.4)
vmpooler-provider-ec2 (0.0.2)
aws-sdk-ec2 (~> 1)
net-ssh (>= 6.2, < 7.1)
vmpooler-provider-gce (0.4.0)
vmpooler-provider-gce (0.5.0)
google-apis-compute_v1 (~> 0.14)
google-cloud-dns (~> 0.35.1)
googleauth (>= 0.16.2, < 1.3.0)
vmpooler-provider-vsphere (2.0.0)
vmpooler (~> 2.3, >= 1.3.0)
vmpooler-provider-vsphere (2.1.0)
rbvmomi2 (>= 3.1, < 4.0)
vmpooler (~> 2.4)
webrick (1.8.1)
zonefile (1.06)

PLATFORMS
universal-java-1.8
universal-java-11

DEPENDENCIES
vmpooler (~> 2.4)
vmpooler-provider-ec2 (~> 0.0.1)
vmpooler-provider-gce (~> 0.4)
vmpooler-provider-vsphere (~> 2.0)
vmpooler (~> 2.5)
vmpooler-provider-gce (~> 0.5)
vmpooler-provider-vsphere (~> 2.1)

BUNDLED WITH
2.4.5
2.4.7
6 changes: 6 additions & 0 deletions docker/install-gemfile-lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

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 git netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
2 changes: 1 addition & 1 deletion docker/update-gemfile-lock
Original file line number Diff line number Diff line change
Expand Up @@ -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 git && cd /app && gem install bundler && 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 netbase && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'