Skip to content

Commit

Permalink
Minor doc and Makefile updates (#425)
Browse files Browse the repository at this point in the history
* Reflect recent JRuby update

* Make local builds work again
  • Loading branch information
ajhodgson authored Jan 7, 2025
1 parent f27d627 commit 6c0f05e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ else
_build_arm64 := 1
endif

# test if we're running in an interactive shell (vs gh actions)
INTERACTIVE:=$(shell [ -t 0 ] && echo 1)

.PHONY: all build_base build_all tag_latest cross_tag push release labels clean clean_images

FORCE:
Expand Down Expand Up @@ -82,6 +85,9 @@ ifeq ($(_build_arm64),1)
endif

build_%:
ifeq ($(INTERACTIVE),1)
build_%: build_base
endif
rm -rf $*_image
cp -pR image $*_image
@if [ "${*}" != "full" ] && [ "${*}" != "customizable" ]; then \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock

Language support:

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

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

0 comments on commit 6c0f05e

Please sign in to comment.