Skip to content

Commit 6c0f05e

Browse files
authored
Minor doc and Makefile updates (#425)
* Reflect recent JRuby update * Make local builds work again
1 parent f27d627 commit 6c0f05e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ else
3535
_build_arm64 := 1
3636
endif
3737

38+
# test if we're running in an interactive shell (vs gh actions)
39+
INTERACTIVE:=$(shell [ -t 0 ] && echo 1)
40+
3841
.PHONY: all build_base build_all tag_latest cross_tag push release labels clean clean_images
3942

4043
FORCE:
@@ -82,6 +85,9 @@ ifeq ($(_build_arm64),1)
8285
endif
8386

8487
build_%:
88+
ifeq ($(INTERACTIVE),1)
89+
build_%: build_base
90+
endif
8591
rm -rf $*_image
8692
cp -pR image $*_image
8793
@if [ "${*}" != "full" ] && [ "${*}" != "customizable" ]; then \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock
9494

9595
Language support:
9696

97-
* Ruby 3.1.6, 3.2.6, 3.3.6, 3.4.1 and JRuby 9.3.15.0 and 9.4.8.0.
97+
* Ruby 3.1.6, 3.2.6, 3.3.6, 3.4.1 and JRuby 9.3.15.0 and 9.4.9.0.
9898
* RVM is used to manage Ruby versions. [Why RVM?](#why_rvm)
9999
* 3.4.1 is configured as the default.
100100
* JRuby is installed from source, but we register an APT entry for it.
@@ -462,8 +462,8 @@ RUN bash -lc 'rvm --default use ruby-3.3.6'
462462
RUN bash -lc 'rvm --default use ruby-3.4.1'
463463
# JRuby 9.3.15.0
464464
RUN bash -lc 'rvm --default use jruby-9.3.15.0'
465-
# JRuby 9.4.8.0
466-
RUN bash -lc 'rvm --default use jruby-9.4.8.0'
465+
# JRuby 9.4.9.0
466+
RUN bash -lc 'rvm --default use jruby-9.4.9.0'
467467
```
468468

469469
Learn more: [RVM: Setting the default Ruby](https://rvm.io/rubies/default).

0 commit comments

Comments
 (0)