diff --git a/lib/generators/dockerfile_generator.rb b/lib/generators/dockerfile_generator.rb index 1250d1d..5b8bb28 100644 --- a/lib/generators/dockerfile_generator.rb +++ b/lib/generators/dockerfile_generator.rb @@ -73,6 +73,7 @@ class DockerfileGenerator < Rails::Generators::Base "libtiff-dev" => "tiff-dev", "libjemalloc2" => "jemalloc", "libvips" => "vips-dev", + "libyaml-dev" => "yaml-dev", "node-gyp" => "gyp", "pkg-config" => "pkgconfig", "python" => "python3", @@ -737,10 +738,10 @@ def base_requirements def build_packages # start with the essentials - packages = %w(build-essential) + packages = %w(build-essential libyaml-dev) packages += @@packages["build"] if @@packages["build"] packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?) - packages << "libyaml-dev" if options.fullstaq? + packages << "libffi-dev" if @@packages["ffi"] # add databases: sqlite3, postgres, mysql packages << "pkg-config" if options.sqlite3? || @sqlite3 diff --git a/test/results/alpine/Dockerfile b/test/results/alpine/Dockerfile index ab730fa..94c67a0 100644 --- a/test/results/alpine/Dockerfile +++ b/test/results/alpine/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems and node modules RUN apk update && \ - apk add build-base gyp libpq-dev pkgconfig python3 && \ + apk add build-base gyp libpq-dev pkgconfig python3 yaml-dev && \ rm -rf /var/cache/apk/* # Install JavaScript dependencies diff --git a/test/results/api/Dockerfile b/test/results/api/Dockerfile index 1b4ee11..a81ab7c 100644 --- a/test/results/api/Dockerfile +++ b/test/results/api/Dockerfile @@ -52,7 +52,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/bin_cd/Dockerfile b/test/results/bin_cd/Dockerfile index efefe64..c0dec6f 100644 --- a/test/results/bin_cd/Dockerfile +++ b/test/results/bin_cd/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/bun/Dockerfile b/test/results/bun/Dockerfile index 93c206e..c7dfdee 100644 --- a/test/results/bun/Dockerfile +++ b/test/results/bun/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config unzip && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config unzip && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install Bun diff --git a/test/results/cache/Dockerfile b/test/results/cache/Dockerfile index 8c9dff4..0d32a32 100644 --- a/test/results/cache/Dockerfile +++ b/test/results/cache/Dockerfile @@ -38,7 +38,7 @@ FROM base AS build RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 # Install JavaScript dependencies ARG NODE_VERSION=xxx diff --git a/test/results/ci/Dockerfile b/test/results/ci/Dockerfile index 5446d51..968ad2e 100644 --- a/test/results/ci/Dockerfile +++ b/test/results/ci/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/env/Dockerfile b/test/results/env/Dockerfile index 25fd6cf..7ba79fb 100644 --- a/test/results/env/Dockerfile +++ b/test/results/env/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Build options diff --git a/test/results/esbuild/Dockerfile b/test/results/esbuild/Dockerfile index e69dcab..e88f42d 100644 --- a/test/results/esbuild/Dockerfile +++ b/test/results/esbuild/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install JavaScript dependencies diff --git a/test/results/execjs_importmap/Dockerfile b/test/results/execjs_importmap/Dockerfile index 63c74a9..826c32c 100644 --- a/test/results/execjs_importmap/Dockerfile +++ b/test/results/execjs_importmap/Dockerfile @@ -42,7 +42,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Build options diff --git a/test/results/execjs_node/Dockerfile b/test/results/execjs_node/Dockerfile index ef3ce85..a5378ab 100644 --- a/test/results/execjs_node/Dockerfile +++ b/test/results/execjs_node/Dockerfile @@ -42,7 +42,7 @@ FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install yarn diff --git a/test/results/grover/Dockerfile b/test/results/grover/Dockerfile index f877e9a..488c600 100644 --- a/test/results/grover/Dockerfile +++ b/test/results/grover/Dockerfile @@ -42,7 +42,7 @@ FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Build options diff --git a/test/results/idle/Dockerfile b/test/results/idle/Dockerfile index 0f9b0e6..f9dcf90 100644 --- a/test/results/idle/Dockerfile +++ b/test/results/idle/Dockerfile @@ -40,7 +40,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/jemalloc/Dockerfile b/test/results/jemalloc/Dockerfile index 74d6035..17fe3c2 100644 --- a/test/results/jemalloc/Dockerfile +++ b/test/results/jemalloc/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/label/Dockerfile b/test/results/label/Dockerfile index e008975..4405b0a 100644 --- a/test/results/label/Dockerfile +++ b/test/results/label/Dockerfile @@ -37,7 +37,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/litefs/Dockerfile b/test/results/litefs/Dockerfile index 9f525cf..e2b3af6 100644 --- a/test/results/litefs/Dockerfile +++ b/test/results/litefs/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/litestream/Dockerfile b/test/results/litestream/Dockerfile index ba383e5..d12c434 100644 --- a/test/results/litestream/Dockerfile +++ b/test/results/litestream/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/minimal/Dockerfile b/test/results/minimal/Dockerfile index fa410e3..a5d9872 100644 --- a/test/results/minimal/Dockerfile +++ b/test/results/minimal/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/mysql/Dockerfile b/test/results/mysql/Dockerfile index 8acd33b..711312e 100644 --- a/test/results/mysql/Dockerfile +++ b/test/results/mysql/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev && \ + apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev libyaml-dev && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/nginx/Dockerfile b/test/results/nginx/Dockerfile index b6d9ffa..31f6f61 100644 --- a/test/results/nginx/Dockerfile +++ b/test/results/nginx/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/no_precompiled_gems/Dockerfile b/test/results/no_precompiled_gems/Dockerfile index 84ef231..b6927ce 100644 --- a/test/results/no_precompiled_gems/Dockerfile +++ b/test/results/no_precompiled_gems/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/no_prep/Dockerfile b/test/results/no_prep/Dockerfile index d2d8328..a94bc4a 100644 --- a/test/results/no_prep/Dockerfile +++ b/test/results/no_prep/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/parallel/Dockerfile b/test/results/parallel/Dockerfile index ab73386..4d433ca 100644 --- a/test/results/parallel/Dockerfile +++ b/test/results/parallel/Dockerfile @@ -35,7 +35,7 @@ FROM base AS prebuild # Install packages needed to build gems and node modules RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/test/results/postgresql/Dockerfile b/test/results/postgresql/Dockerfile index c7ff96a..a7e87b9 100644 --- a/test/results/postgresql/Dockerfile +++ b/test/results/postgresql/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential libpq-dev && \ + apt-get install --no-install-recommends -y build-essential libpq-dev libyaml-dev && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/precompile_defer/Dockerfile b/test/results/precompile_defer/Dockerfile index e9c4baa..6f30587 100644 --- a/test/results/precompile_defer/Dockerfile +++ b/test/results/precompile_defer/Dockerfile @@ -31,7 +31,7 @@ ENV BUNDLE_DEPLOYMENT="1" \ # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/private_gemserver/Dockerfile b/test/results/private_gemserver/Dockerfile index f324a7a..b78c84e 100644 --- a/test/results/private_gemserver/Dockerfile +++ b/test/results/private_gemserver/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/private_gemserver_with_cache/Dockerfile b/test/results/private_gemserver_with_cache/Dockerfile index b9b4b6a..9e2a14a 100644 --- a/test/results/private_gemserver_with_cache/Dockerfile +++ b/test/results/private_gemserver_with_cache/Dockerfile @@ -38,7 +38,7 @@ FROM base AS build RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \ apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config # Install application gems COPY Gemfile Gemfile.lock ./ diff --git a/test/results/redis/Dockerfile b/test/results/redis/Dockerfile index b028598..fe22973 100644 --- a/test/results/redis/Dockerfile +++ b/test/results/redis/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/rmagick/Dockerfile b/test/results/rmagick/Dockerfile index 3f5bbd6..ae6c92d 100644 --- a/test/results/rmagick/Dockerfile +++ b/test/results/rmagick/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential libmagickwand-dev pkg-config && \ + apt-get install --no-install-recommends -y build-essential libmagickwand-dev libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/shrine/Dockerfile b/test/results/shrine/Dockerfile index fa410e3..a5d9872 100644 --- a/test/results/shrine/Dockerfile +++ b/test/results/shrine/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/sidekiq/Dockerfile b/test/results/sidekiq/Dockerfile index c7ff96a..a7e87b9 100644 --- a/test/results/sidekiq/Dockerfile +++ b/test/results/sidekiq/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential libpq-dev && \ + apt-get install --no-install-recommends -y build-essential libpq-dev libyaml-dev && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/solid_queue_postgres/Dockerfile b/test/results/solid_queue_postgres/Dockerfile index c7ff96a..a7e87b9 100644 --- a/test/results/solid_queue_postgres/Dockerfile +++ b/test/results/solid_queue_postgres/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential libpq-dev && \ + apt-get install --no-install-recommends -y build-essential libpq-dev libyaml-dev && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/solid_queue_sqlite3/Dockerfile b/test/results/solid_queue_sqlite3/Dockerfile index 50b2d15..575b690 100644 --- a/test/results/solid_queue_sqlite3/Dockerfile +++ b/test/results/solid_queue_sqlite3/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/sqlite3/Dockerfile b/test/results/sqlite3/Dockerfile index b028598..fe22973 100644 --- a/test/results/sqlite3/Dockerfile +++ b/test/results/sqlite3/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/swap/Dockerfile b/test/results/swap/Dockerfile index 8767c9f..3e2c3e7 100644 --- a/test/results/swap/Dockerfile +++ b/test/results/swap/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/thruster/Dockerfile b/test/results/thruster/Dockerfile index 979667a..7f15659 100644 --- a/test/results/thruster/Dockerfile +++ b/test/results/thruster/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/trilogy/Dockerfile b/test/results/trilogy/Dockerfile index b5c6872..5c48f58 100644 --- a/test/results/trilogy/Dockerfile +++ b/test/results/trilogy/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/vite/Dockerfile b/test/results/vite/Dockerfile index 1b64b65..432888f 100644 --- a/test/results/vite/Dockerfile +++ b/test/results/vite/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install Node.js diff --git a/test/results/windows/Dockerfile b/test/results/windows/Dockerfile index 5b4e963..1796a5c 100644 --- a/test/results/windows/Dockerfile +++ b/test/results/windows/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems diff --git a/test/results/yjit/Dockerfile b/test/results/yjit/Dockerfile index 1c454b0..ee96296 100644 --- a/test/results/yjit/Dockerfile +++ b/test/results/yjit/Dockerfile @@ -35,7 +35,7 @@ FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential pkg-config && \ + apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems