Skip to content

Commit c031e0e

Browse files
committed
Slim and alpine dependency updates in base ruby images
See: * docker-library/ruby#497 * rails/rails#54237
1 parent da650c7 commit c031e0e

File tree

40 files changed

+41
-40
lines changed

40 files changed

+41
-40
lines changed

lib/generators/dockerfile_generator.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class DockerfileGenerator < Rails::Generators::Base
7373
"libtiff-dev" => "tiff-dev",
7474
"libjemalloc2" => "jemalloc",
7575
"libvips" => "vips-dev",
76+
"libyaml-dev" => "yaml-dev",
7677
"node-gyp" => "gyp",
7778
"pkg-config" => "pkgconfig",
7879
"python" => "python3",
@@ -737,7 +738,7 @@ def base_requirements
737738

738739
def build_packages
739740
# start with the essentials
740-
packages = %w(build-essential)
741+
packages = %w(build-essential libyaml-dev)
741742
packages += @@packages["build"] if @@packages["build"]
742743
packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
743744
packages << "libyaml-dev" if options.fullstaq?

test/results/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems and node modules
3737
RUN apk update && \
38-
apk add build-base gyp libpq-dev pkgconfig python3 && \
38+
apk add build-base gyp libpq-dev pkgconfig python3 yaml-dev && \
3939
rm -rf /var/cache/apk/*
4040

4141
# Install JavaScript dependencies

test/results/api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ FROM base AS build
5252

5353
# Install packages needed to build gems
5454
RUN apt-get update -qq && \
55-
apt-get install --no-install-recommends -y build-essential pkg-config && \
55+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
5656
rm -rf /var/lib/apt/lists /var/cache/apt/archives
5757

5858
# Install application gems

test/results/bin_cd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential pkg-config && \
38+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install application gems

test/results/bun/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential pkg-config unzip && \
38+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config unzip && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install Bun

test/results/cache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ FROM base AS build
3838
RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
3939
--mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
4040
apt-get update -qq && \
41-
apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3
41+
apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3
4242

4343
# Install JavaScript dependencies
4444
ARG NODE_VERSION=xxx

test/results/ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential pkg-config && \
38+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install application gems

test/results/env/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential pkg-config && \
38+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Build options

test/results/esbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems and node modules
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \
38+
apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install JavaScript dependencies

test/results/execjs_importmap/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ FROM base AS build
4242

4343
# Install packages needed to build gems
4444
RUN apt-get update -qq && \
45-
apt-get install --no-install-recommends -y build-essential pkg-config && \
45+
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
4646
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4747

4848
# Build options

0 commit comments

Comments
 (0)