diff --git a/Dockerfile b/Dockerfile index c211862..da45251 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,7 @@ ARG RUBYGEMS_VERSION_ARG="" \ BUNDLER_VERSION_ARG="" # Define dependencies base versions -ENV RUBYGEMS_VERSION=${RUBYGEMS_VERSION_ARG:-${RUBYGEMS_VERSION}} \ - BUNDLER_VERSION=${BUNDLER_VERSION_ARG} \ - NODE_VERSION="16" \ +ENV NODE_VERSION="16" \ GOSU_VERSION="1.16" # Define some default variables @@ -164,8 +162,8 @@ RUN set -eux; \ # Install GEM dependencies # Note: we still need Bundler 1.x because Bundler auto-switches to it when it encounters a Gemfile.lock with BUNDLED WITH 1.x -RUN gem update --system ${RUBYGEMS_VERSION} \ - && gem install bundler${BUNDLER_VERSION:+:${BUNDLER_VERSION}} \ +RUN gem update --system ${RUBYGEMS_VERSION_ARG} \ + && gem install bundler${BUNDLER_VERSION_ARG:+:${BUNDLER_VERSION_ARG}} \ && gem install bundler:1.17.3 # Add dot files to the home directory skeleton (they persist IRB/Pry/Rails console history, configure Yarn, etc…) diff --git a/RECIPES.md b/RECIPES.md index fee147d..a11c29e 100644 --- a/RECIPES.md +++ b/RECIPES.md @@ -431,7 +431,7 @@ This can be particularly useful with configurations like the one traditionally s ### Bundler 1.x -Our image uses Bundler 2.x by default, but for convenience, it also embeds Bundler 1.x. To use it in your legacy project, simply set the `BUNDLER_VERSION` environment variable from your `docker-compose.yml`: +Our image uses Bundler 2.x by default, but for convenience, it also embeds Bundler 1.x. To use it in your legacy project, simply set the [(undocumented) `BUNDLER_VERSION` environment variable](https://github.com/rubygems/rubygems/issues/3978) from your `docker-compose.yml`: ```yaml services: diff --git a/test/cowsay/Gemfile.lock b/test/cowsay/Gemfile.lock index 43d9679..2e80e58 100644 --- a/test/cowsay/Gemfile.lock +++ b/test/cowsay/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - ruby_cowsay (0.1.2) + ruby_cowsay (0.1.3) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES ruby_cowsay BUNDLED WITH - 1.16.6 + 2.4.17