diff --git a/Dockerfile b/Dockerfile index f0de7b0..10b8aa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=docker.io/ruby:3.2.5-bookworm +ARG BASE_IMAGE=docker.io/ruby:3.2.5-alpine3.20 FROM $BASE_IMAGE @@ -45,16 +45,13 @@ COPY voxbox/Gemfile / COPY voxbox/Rakefile / COPY Dockerfile / -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y yamllint \ - && apt-get autoremove -y \ - && apt-get clean \ +RUN apk update \ + && apk upgrade \ + && apk add --no-cache --update alpine-sdk \ + && apk add --no-cache --update yamllint \ && bundle config set path.system true \ && bundle config set jobs $(nproc) \ && bundle install --gemfile=/Gemfile \ - && apt-get purge -y "libaom*" linux-libc-dev "libmagick*" "imagemagick-*" \ - && rm -rf /var/lib/apt/lists/* \ && rm -rf /usr/local/lib/ruby/gems/*/cache/* \ && rm -rf /usr/local/lib/ruby/gems/2.7.0/gems/cgi-0.1.0.2 \ && rm -rf /usr/local/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.2.gemspec \ diff --git a/build_versions.json b/build_versions.json index 74b2ce3..682902e 100644 --- a/build_versions.json +++ b/build_versions.json @@ -2,7 +2,7 @@ "include": [ { "puppet_release": 7, - "base_image": "ghcr.io/betadots/ruby:2.7.8-focal", + "base_image": "docker.io/ruby:2.7.8-alpine3.16", "rubygem_puppet": "7.31.0", "rubygem_facter": "4.7.1", "rubygem_voxpupuli_test": "8.1.0", @@ -17,7 +17,7 @@ }, { "puppet_release": 8, - "base_image": "docker.io/ruby:3.2.5-bookworm", + "base_image": "docker.io/ruby:3.2.5-alpine3.20", "rubygem_puppet": "8.7.0", "rubygem_facter": "4.7.1", "rubygem_voxpupuli_test": "8.1.0",