Skip to content

Commit

Permalink
Merge pull request #99 from ruby/retired-eol-versions
Browse files Browse the repository at this point in the history
Retired EOL versions
  • Loading branch information
hsbt authored Jun 5, 2024
2 parents d8a1d86 + b67f155 commit a74d703
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 26 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
- noble
- jammy
- focal
- bionic

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ jobs:
- noble
- jammy
- focal
- bionic
ruby_version:
- 3.0.7
- 3.1.6
- 3.2.4
- 3.3.2
Expand Down
15 changes: 0 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ ENV DEBIAN_FRONTEND noninteractive

RUN set -ex && \
apt-get update && \
\
if test "x$BASE_IMAGE_TAG" = "xbionic"; then \
apt-get install -y --no-install-recommends \
software-properties-common && \
apt-add-repository ppa:git-core/ppa; \
fi && \
\
apt-get install -y --no-install-recommends \
autoconf \
bison \
Expand Down Expand Up @@ -80,14 +73,6 @@ ENV DEBIAN_FRONTEND noninteractive

RUN set -ex && \
apt-get update && \
\
if test "x$BASE_IMAGE_TAG" = "xbionic"; then \
apt-get install -y --no-install-recommends \
software-properties-common \
&& \
apt-add-repository ppa:git-core/ppa; \
fi && \
\
apt-get install -y --no-install-recommends \
ca-certificates \
libffi-dev \
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ The list of image names in this repository is below:

We have some other images for special purposes.

- Preview or Release-candidate versions (e.g. `rubylang/ruby:2.7.0-preview1-bionic`)
- Nightly built master (e.g. `rubylang/ruby:master-nightly-bionic`)
- Nightly debug built master (e.g. `rubylang/ruby:master-debug-nightly-bionic`)
- EOL versions (e.g. `rubylang/ruby:2.4.10-bionic`)
- Preview or Release-candidate versions (e.g. `rubylang/ruby:2.7.0-preview1-jammy`)
- Nightly built master (e.g. `rubylang/ruby:master-nightly-jammy`)
- Nightly debug built master (e.g. `rubylang/ruby:master-debug-nightly-jammy`)
- EOL versions (e.g. `rubylang/ruby:2.4.10-jammy`)

All the images are based on `ubuntu:bionic`, and made from just doing `make install` and installing bundler.
All the images are based on `ubuntu:jammy`, and made from just doing `make install` and installing bundler.

## How to build images

Expand Down
4 changes: 1 addition & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ def download(url)
end

def default_ubuntu_version(ruby_version)
if ruby_version < "3.0"
"bionic"
elsif ruby_version < "3.1"
if ruby_version < "3.1"
"focal"
else
"jammy"
Expand Down

0 comments on commit a74d703

Please sign in to comment.