From 2cbfaf95fa29a6610067f9e9518cac94f9f96c40 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 23 Apr 2024 17:51:27 +0100 Subject: [PATCH 1/6] fix(deps): update cacerts to 20240226-r0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 661aecb..274935c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk update \ && apk add ruby=3.2.2-r0 \ ruby-bigdecimal=3.2.2-r0 \ ruby-io-console=3.2.2-r0 \ - ca-certificates=20230506-r0 \ + ca-certificates=20240226-r0 \ libressl \ less \ git \ From ab3e8a0c693800d6b2e28c9eb8f13ecf50adc57b Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 23 Apr 2024 17:55:36 +0100 Subject: [PATCH 2/6] =?UTF-8?q?fix(deps):=20pin=20bigdecimal=20to=203.1.3?= =?UTF-8?q?=20provided=20by=20stdlib=20=E2=88=99=20=E2=88=99=20-=20update?= =?UTF-8?q?=20of=20tins,=20via=20term-ansicolour,=20uses=20bigdecimal,=20c?= =?UTF-8?q?urrently=20at=203.17=20=E2=88=99=20-=20bigdecimal=20is=20instal?= =?UTF-8?q?led=20in=20the=20dockerfile=20via=20alpine,=20which=20only=20pr?= =?UTF-8?q?ovides=20the=20stdlid=20version=20as=20it=20is=20locked=20to=20?= =?UTF-8?q?3.2.2-r0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 3 ++- pact-cli.gemspec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38f799c..7ee7c98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,7 @@ PATH remote: . specs: pact-cli (1.1.0) + bigdecimal (= 3.1.3) json (~> 2.3) pact-mock_service pact-provider-verifier @@ -19,7 +20,7 @@ GEM remote: https://rubygems.org/ specs: awesome_print (1.9.2) - bigdecimal (3.1.7) + bigdecimal (3.1.3) bump (0.10.0) coderay (1.1.3) diff-lcs (1.5.1) diff --git a/pact-cli.gemspec b/pact-cli.gemspec index 53a1d80..ba02994 100644 --- a/pact-cli.gemspec +++ b/pact-cli.gemspec @@ -45,6 +45,7 @@ Gem::Specification.new do |spec| spec.add_dependency "pact-provider-verifier" spec.add_dependency "pact_broker-client", "~> 1.28" spec.add_dependency "json", "~>2.3" # must match native lib install in the Dockerfile + spec.add_dependency "bigdecimal", "3.1.3" # pin to std gem version https://stdgems.org/3.2.2/ # Locking this until we have given rack-test 3.0 a good shake out in pure Ruby spec.add_dependency "rack-test", ">= 0.6.3", "< 2.0.0" From fe10bdddc6ee7fd6af5e099daeb58c39a4bb9fda Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 23 Apr 2024 18:11:48 +0100 Subject: [PATCH 3/6] deps: update bundler to 2.5.9 / build bigdecimal from source --- Dockerfile | 4 ++-- Dockerfile-node | 5 ++--- Gemfile.lock | 5 ++--- pact-cli.gemspec | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 274935c..b81d0aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ ADD docker/pact /usr/local/bin/pact RUN apk update \ && apk add ruby=3.2.2-r0 \ - ruby-bigdecimal=3.2.2-r0 \ ruby-io-console=3.2.2-r0 \ ca-certificates=20240226-r0 \ libressl \ @@ -21,12 +20,13 @@ RUN apk update \ ruby-dev=3.2.2-r0 \ libressl-dev \ ruby-rdoc=3.2.2-r0 \ - && gem install bundler -v 2.4 \ + && gem install bundler -v "~>2.5" \ && bundler -v \ && bundle config build.nokogiri --use-system-libraries \ && bundle config git.allow_insecure true \ && gem update --system \ && gem install json -v "~>2.3" \ + && gem install bigdecimal -v "~>3.1" \ && gem cleanup \ && apk del build-dependencies \ && rm -rf /usr/lib/ruby/gems/*/cache/* \ diff --git a/Dockerfile-node b/Dockerfile-node index 95f2e34..38892c1 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -1,5 +1,5 @@ ARG NODE_VERSION=18 -FROM node:${NODE_VERSION}-alpine3.17 +FROM node:${NODE_VERSION}-alpine3.18 LABEL maintainer="Beth Skurrie " @@ -16,7 +16,6 @@ ADD docker/pact /usr/local/bin/pact RUN apk update \ && apk add ruby \ - ruby-bigdecimal \ ruby-bundler \ ruby-io-console \ ca-certificates \ @@ -29,7 +28,7 @@ RUN apk update \ libressl-dev \ ruby-rdoc \ \ - && gem install bundler -v 2.4.12 \ + && gem install bundler -v "~>2.5" \ && bundler -v \ && bundle config build.nokogiri --use-system-libraries \ && bundle config git.allow_insecure true \ diff --git a/Gemfile.lock b/Gemfile.lock index 7ee7c98..aba180d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,6 @@ PATH remote: . specs: pact-cli (1.1.0) - bigdecimal (= 3.1.3) json (~> 2.3) pact-mock_service pact-provider-verifier @@ -20,7 +19,7 @@ GEM remote: https://rubygems.org/ specs: awesome_print (1.9.2) - bigdecimal (3.1.3) + bigdecimal (3.1.7) bump (0.10.0) coderay (1.1.3) diff-lcs (1.5.1) @@ -137,4 +136,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.4.12 + 2.5.9 diff --git a/pact-cli.gemspec b/pact-cli.gemspec index ba02994..53a1d80 100644 --- a/pact-cli.gemspec +++ b/pact-cli.gemspec @@ -45,7 +45,6 @@ Gem::Specification.new do |spec| spec.add_dependency "pact-provider-verifier" spec.add_dependency "pact_broker-client", "~> 1.28" spec.add_dependency "json", "~>2.3" # must match native lib install in the Dockerfile - spec.add_dependency "bigdecimal", "3.1.3" # pin to std gem version https://stdgems.org/3.2.2/ # Locking this until we have given rack-test 3.0 a good shake out in pure Ruby spec.add_dependency "rack-test", ">= 0.6.3", "< 2.0.0" From 9fe1ccdd09c44f869a18d08c321782600d1aeb24 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 23 Apr 2024 18:12:35 +0100 Subject: [PATCH 4/6] deps: update base image to alpine 3.19 --- Dockerfile | 10 +++++----- Dockerfile-bundle-base | 2 +- Dockerfile-node | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b81d0aa..58a04eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 LABEL maintainer="Beth Skurrie " @@ -9,17 +9,17 @@ ADD docker/gemrc /root/.gemrc ADD docker/pact /usr/local/bin/pact RUN apk update \ - && apk add ruby=3.2.2-r0 \ - ruby-io-console=3.2.2-r0 \ + && apk add ruby=3.2.2-r1 \ + ruby-io-console=3.2.2-r1 \ ca-certificates=20240226-r0 \ libressl \ less \ git \ && apk add --virtual "build-dependencies" \ build-base=0.5-r3 \ - ruby-dev=3.2.2-r0 \ + ruby-dev=3.2.2-r1 \ libressl-dev \ - ruby-rdoc=3.2.2-r0 \ + ruby-rdoc=3.2.2-r1 \ && gem install bundler -v "~>2.5" \ && bundler -v \ && bundle config build.nokogiri --use-system-libraries \ diff --git a/Dockerfile-bundle-base b/Dockerfile-bundle-base index 6c61b13..5f76af6 100644 --- a/Dockerfile-bundle-base +++ b/Dockerfile-bundle-base @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1 ENV BUNDLE_SILENCE_ROOT_WARNING=1 diff --git a/Dockerfile-node b/Dockerfile-node index 38892c1..eaa6297 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -1,5 +1,5 @@ ARG NODE_VERSION=18 -FROM node:${NODE_VERSION}-alpine3.18 +FROM node:${NODE_VERSION}-alpine3.19 LABEL maintainer="Beth Skurrie " From 76a1521c3bbd7be12f661c4f1bad25eb23930dcb Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 23 Apr 2024 18:16:22 +0100 Subject: [PATCH 5/6] chore: update Dockerfile-node to delete 3.2.0 gems --- Dockerfile-node | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-node b/Dockerfile-node index eaa6297..0d7d702 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -50,7 +50,7 @@ ADD Gemfile . ADD Gemfile.lock . ADD lib/pact/cli/version.rb ./lib/pact/cli/version.rb RUN bundle install --without test development --deployment true \ - && find /usr/lib/ruby/gems/3.1.0/gems -name Gemfile.lock -maxdepth 2 -delete + && find /usr/lib/ruby/gems/3.2.0/gems -name Gemfile.lock -maxdepth 2 -delete ADD docker/entrypoint.sh $HOME/entrypoint.sh ADD bin ./bin ADD lib ./lib From 36b7de76d7763b431b59f552c10136485638655a Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Fri, 10 May 2024 14:15:28 +0100 Subject: [PATCH 6/6] deps: update to ruby 3.2.4 --- Dockerfile | 8 ++++---- Dockerfile-bundle-base | 4 ++-- Gemfile.lock | 14 +++++++++----- pact-cli.gemspec | 1 + 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58a04eb..f9df093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,17 +9,17 @@ ADD docker/gemrc /root/.gemrc ADD docker/pact /usr/local/bin/pact RUN apk update \ - && apk add ruby=3.2.2-r1 \ - ruby-io-console=3.2.2-r1 \ + && apk add ruby=3.2.4-r0 \ + ruby-io-console=3.2.4-r0 \ ca-certificates=20240226-r0 \ libressl \ less \ git \ && apk add --virtual "build-dependencies" \ build-base=0.5-r3 \ - ruby-dev=3.2.2-r1 \ + ruby-dev=3.2.4-r0 \ libressl-dev \ - ruby-rdoc=3.2.2-r1 \ + ruby-rdoc=3.2.4-r0 \ && gem install bundler -v "~>2.5" \ && bundler -v \ && bundle config build.nokogiri --use-system-libraries \ diff --git a/Dockerfile-bundle-base b/Dockerfile-bundle-base index 5f76af6..772fbb8 100644 --- a/Dockerfile-bundle-base +++ b/Dockerfile-bundle-base @@ -7,7 +7,6 @@ ADD docker/gemrc /root/.gemrc RUN apk update \ && apk add ruby \ - ruby-bigdecimal \ ruby-bundler \ ruby-io-console \ ca-certificates \ @@ -22,7 +21,8 @@ RUN apk update \ && bundle config build.nokogiri --use-system-libraries \ && bundle config git.allow_insecure true \ && gem update --system \ - && gem install json + && gem install json \ + && gem install bigdecimal ENV HOME /pact ENV DOCKER true diff --git a/Gemfile.lock b/Gemfile.lock index aba180d..6d00fed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,7 @@ PATH remote: . specs: pact-cli (1.1.0) + bigdecimal (~> 3.1) json (~> 2.3) pact-mock_service pact-provider-verifier @@ -19,9 +20,10 @@ GEM remote: https://rubygems.org/ specs: awesome_print (1.9.2) - bigdecimal (3.1.7) + bigdecimal (3.1.8) bump (0.10.0) coderay (1.1.3) + csv (3.3.0) diff-lcs (1.5.1) dig_rb (1.0.1) expgen (0.1.1) @@ -33,13 +35,15 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) find_a_port (1.0.1) - httparty (0.21.0) + httparty (0.22.0) + csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) json (2.7.2) method_source (1.1.0) mini_mime (1.1.5) - multi_xml (0.6.0) + multi_xml (0.7.1) + bigdecimal (~> 3.1) net-http (0.4.1) uri pact (1.64.0) @@ -107,7 +111,7 @@ GEM rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) @@ -136,4 +140,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.5.9 + 2.5.10 diff --git a/pact-cli.gemspec b/pact-cli.gemspec index 53a1d80..7c07aa5 100644 --- a/pact-cli.gemspec +++ b/pact-cli.gemspec @@ -45,6 +45,7 @@ Gem::Specification.new do |spec| spec.add_dependency "pact-provider-verifier" spec.add_dependency "pact_broker-client", "~> 1.28" spec.add_dependency "json", "~>2.3" # must match native lib install in the Dockerfile + spec.add_dependency "bigdecimal", "~>3.1" # must match native lib install in the Dockerfile # Locking this until we have given rack-test 3.0 a good shake out in pure Ruby spec.add_dependency "rack-test", ">= 0.6.3", "< 2.0.0"