fix: Remove install of specific bundle version

flecto-io · Jan 9, 2024 · 09a4b16 · 09a4b16
1 parent 4fab275
commit 09a4b16
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 80 deletions.
diff --git a/18-2.6.6/Dockerfile b/18-2.6.6/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.6.10/Dockerfile b/20-2.6.10/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.6.6/Dockerfile b/20-2.6.6/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.6.8/Dockerfile b/20-2.6.8/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.6.9/Dockerfile b/20-2.6.9/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.7.4/Dockerfile b/20-2.7.4/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.7.5/Dockerfile b/20-2.7.5/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.7.6/Dockerfile b/20-2.7.6/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.7.7/Dockerfile b/20-2.7.7/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD Gemfile* $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-2.7.8/Dockerfile b/20-2.7.8/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD Gemfile* $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-3.0.2/Dockerfile b/20-3.0.2/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-3.0.3/Dockerfile b/20-3.0.3/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/20-3.1.2/Dockerfile b/20-3.1.2/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/22-3.1.2/Dockerfile b/22-3.1.2/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/22-3.1.4/Dockerfile b/22-3.1.4/Dockerfile
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency

diff --git a/Dockerfile.template b/Dockerfile.template
@@ -87,11 +87,6 @@ RUN set -ex ;\
 WORKDIR $HOME
 ONBUILD ADD . $HOME
 ONBUILD RUN set -ex ;\
-    # TODO @jfloff : won't be needed when we upgrade to Rails 5
-    # install bundler packed with Gemfile if we have that information in the Gemfile.lock
-    # ref: https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
-    if [ -f Gemfile.lock ]; then GEMFILE_LOCK_BUNDLE_VERSION=$(awk '/BUNDLED WITH/{getline; print}' Gemfile.lock | xargs) ; else GEMFILE_LOCK_BUNDLE_VERSION="" ; fi ;\
-    gem install --no-document bundler $(if [ -z "$GEMFILE_LOCK_BUNDLE_VERSION" ]; then echo "" ; else echo "-v $GEMFILE_LOCK_BUNDLE_VERSION" ; fi) ;\
     # force bundle to use github https protocol
     bundle config github.https true
     # avoid installing gems here so we give a chance for child images to install any dependency