Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor doc and Makefile updates #425

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Minor doc and Makefile updates #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823ae9b
Reflect recent JRuby update
ajhodgson Jan 6, 2025
39cd5ea
Make local builds work again
ajhodgson Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
Loading