Merge pull request #130 from pact-foundation/deps/alpine_3.19

deps: update base image to alpine 3.19

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 LABEL maintainer="Beth Skurrie <[email protected]>"
 
@@ -9,24 +9,24 @@ ADD docker/gemrc /root/.gemrc
 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=20230506-r0 \
+  && 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-r0 \
+             ruby-dev=3.2.4-r0 \
              libressl-dev \
-             ruby-rdoc=3.2.2-r0 \
-  && gem install bundler -v 2.4 \
+             ruby-rdoc=3.2.4-r0 \
+  && 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/* \

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
@@ -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

Dockerfile-node

@@ -1,5 +1,5 @@
 ARG NODE_VERSION=18
-FROM node:${NODE_VERSION}-alpine3.17
+FROM node:${NODE_VERSION}-alpine3.19
 
 LABEL maintainer="Beth Skurrie <[email protected]>"
 
@@ -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 \
@@ -51,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

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.4.12
+   2.5.10

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"