Skip to content

Commit

Permalink
Update ruby and base-image
Browse files Browse the repository at this point in the history
  • Loading branch information
m-bucher committed Jun 25, 2024
1 parent a87093b commit cc8dae2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5
ruby-version: 3.3
bundler-cache: true
- name: Setup rubocop
run: |
Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ stages:
- test

variables:
RUBY_VERSION: "2.5"
RUBY_IMAGE: "ruby:${RUBY_VERSION}-buster"
RUBY_VERSION: "3.3"
RUBY_IMAGE: "ruby:${RUBY_VERSION}-bookworm"

.common:
image: ${RUBY_IMAGE}
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5-buster
FROM ruby:3.3-bookworm

LABEL maintainer="Markus Bucher <[email protected]>" \
description="This container provides an errata-parser for Debian and Ubuntu" \
Expand All @@ -12,7 +12,9 @@ RUN apt-get update && apt-get install -y \
# Add and install the errata parser:
COPY . /errata_parser/
WORKDIR /errata_parser
RUN bundle install --deployment --without rubocop
RUN bundle config set --local deployment 'true'
RUN bundle config set --local without 'rubocop'
RUN bundle install

# Configure and run the errata parser:
VOLUME /errata
Expand Down
24 changes: 13 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ GEM
specs:
ast (2.4.2)
byebug (11.1.3)
bzip2-ffi (1.1.0)
bzip2-ffi (1.1.1)
ffi (~> 1.0)
ffi (1.15.4)
jaro_winkler (1.5.4)
ffi (1.16.3)
jaro_winkler (1.5.6)
parallel (1.20.1)
parser (3.0.2.0)
parser (3.3.1.0)
ast (~> 2.4.1)
power_assert (2.0.1)
racc
power_assert (2.0.3)
powerpack (0.1.3)
rainbow (3.0.0)
racc (1.7.3)
rainbow (3.1.1)
rubocop (0.61.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand All @@ -22,14 +24,14 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-debian (0.3.8)
ruby-progressbar (1.11.0)
ruby-xz (1.0.0)
test-unit (3.5.1)
ruby-progressbar (1.13.0)
ruby-xz (1.0.3)
test-unit (3.6.2)
power_assert
unicode-display_width (1.4.1)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
byebug (~> 11.1)
Expand All @@ -41,4 +43,4 @@ DEPENDENCIES
test-unit (~> 3.2)

BUNDLED WITH
1.17.3
2.5.9
1 change: 1 addition & 0 deletions gen_errata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
require 'time'
require 'debian'
require 'pathname'
require 'set'

require_relative 'parse_dsalist'
require_relative 'downloader'
Expand Down

0 comments on commit cc8dae2

Please sign in to comment.