From 58c8e4d18994b6e47037b4d6d9b109b6a99b758f Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 25 Jun 2024 16:14:28 +0100 Subject: [PATCH] fix(deps): update to alpine 3.20 / Ruby 3.3.3 --- .ruby-version | 2 +- Dockerfile | 10 +++++----- Dockerfile-bundle-base | 2 +- Dockerfile-node | 2 +- Gemfile.lock | 14 ++++++++++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4fe5631..3f09e91 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2 \ No newline at end of file +3.3.3 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f9df093..4a9816c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.20 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.4-r0 \ - ruby-io-console=3.2.4-r0 \ + && apk add ruby=3.3.3-r0 \ + ruby-io-console=3.3.3-r0 \ ca-certificates=20240226-r0 \ libressl \ less \ git \ && apk add --virtual "build-dependencies" \ build-base=0.5-r3 \ - ruby-dev=3.2.4-r0 \ + ruby-dev=3.3.3-r0 \ libressl-dev \ - ruby-rdoc=3.2.4-r0 \ + ruby-rdoc=3.3.3-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 f50413c..b1f4f1c 100644 --- a/Dockerfile-bundle-base +++ b/Dockerfile-bundle-base @@ -1,4 +1,4 @@ -FROM alpine:3 +FROM alpine:3.20 ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1 ENV BUNDLE_SILENCE_ROOT_WARNING=1 diff --git a/Dockerfile-node b/Dockerfile-node index 0d7d702..03c280d 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -1,5 +1,5 @@ ARG NODE_VERSION=18 -FROM node:${NODE_VERSION}-alpine3.19 +FROM node:${NODE_VERSION}-alpine3.20 LABEL maintainer="Beth Skurrie " diff --git a/Gemfile.lock b/Gemfile.lock index e8c00d5..0d688cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ GEM dig_rb (1.0.1) expgen (0.1.1) parslet - faraday (2.9.1) + faraday (2.9.2) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http @@ -43,6 +43,8 @@ GEM json (2.7.2) method_source (1.1.0) mini_mime (1.1.5) + mize (0.4.1) + protocol (~> 2.0) multi_xml (0.7.1) bigdecimal (~> 3.1) net-http (0.4.1) @@ -91,9 +93,12 @@ GEM term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) parslet (2.0.0) + protocol (2.0.0) + ruby_parser (~> 3.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) + racc (1.8.0) rack (2.2.9) rack-proxy (0.7.7) rack @@ -119,9 +124,14 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) + ruby_parser (3.21.0) + racc (~> 1.5) + sexp_processor (~> 4.16) + sexp_processor (4.17.1) sync (0.5.0) table_print (1.5.7) - term-ansicolor (1.8.0) + term-ansicolor (1.10.2) + mize tins (~> 1.0) thor (1.3.1) tins (1.33.0)