Skip to content

Commit 27828d7

Browse files
authored
Merge pull request #595 from IU-Libraries-Joint-Development/backport-Dockerfile_tweak
backport Dockerfile change to resolve bundler/byebug conflict
2 parents e38cc9a + b37dfd2 commit 27828d7

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ COPY --chown=essi:essi Gemfile Gemfile.lock ./
4141
# DEV ONLY - REMOVE LATER
4242
# COPY --chown=essi:essi vendor/engines/bulkrax /app/vendor/engines/bulkrax
4343
# COPY --chown=essi:essi vendor/engines/allinson_flex /app/vendor/engines/allinson_flex
44-
RUN gem update bundler
44+
# hold back from bundler 2.5 onwards until ruby is updated
45+
# RUN gem update bundler
46+
RUN gem install bundler -v "~> 2.4.22"
4547
RUN bundle install -j 2 --retry=3
4648

4749
COPY --chown=essi:essi . .
@@ -65,7 +67,9 @@ RUN bundle config --global frozen 1
6567
COPY --chown=essi:essi Gemfile Gemfile.lock ./
6668
# DEV ONLY - REMOVE LATER
6769
# COPY vendor/engines/allinson_flex vendor/engines/allinson_flex
68-
RUN gem update bundler && \
70+
# hold back from bundler 2.5 onwards until ruby is updated
71+
# RUN gem update bundler && \
72+
RUN gem install bundler -v "~> 2.4.22" && \
6973
bundle install -j 2 --retry=3 --deployment --without development
7074

7175
COPY --chown=essi:essi . .

0 commit comments

Comments
 (0)