Skip to content

Commit e59eef4

Browse files
timbru31timbru31
authored
feat: adds Ruby 3.5 (RC) supprot
1 parent cfa82d2 commit e59eef4

File tree

10 files changed

+120
-7
lines changed

10 files changed

+120
-7
lines changed

‎.github/workflows/buildx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ruby-version: [3.2, 3.3, 3.4]
17+
ruby-version: [3.2, 3.3, 3.4, 3.5]
1818
node-version: [20, 22]
1919
variant: [default, slim, alpine]
2020
include:

‎.github/workflows/dockerimage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby-version: [3.2, 3.3, 3.4]
16+
ruby-version: [3.2, 3.3, 3.4, 3.5]
1717
node-version: [20, 22]
1818
variant: [default, slim, alpine]
1919

‎.github/workflows/hadolint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- run: brew install hadolint
1616

1717
- run: |
18-
hadolint {3.2,3.3,3.4}/**/*Dockerfile
19-
hadolint {3.2,3.3,3.4}/**/**/*Dockerfile
18+
hadolint {3.2,3.3,3.4,3.5}/**/*Dockerfile
19+
hadolint {3.2,3.3,3.4,3.5}/**/**/*Dockerfile

‎3.5/20/Dockerfile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM ruby:3.5-rc
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
ARG NODE_MAJOR=20
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
13+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
14+
&& apt-get update -qq && apt-get install -qq --no-install-recommends \
15+
nodejs \
16+
&& apt-get upgrade -qq \
17+
&& apt-get clean \
18+
&& rm -rf /var/lib/apt/lists/*\
19+
&& npm install -g yarn@1

‎3.5/20/alpine/Dockerfile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM ruby:3.5-rc--alpine
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
7+
RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.20/community >> /etc/apk/repositories \
8+
&& echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.20/main >> /etc/apk/repositories \
9+
&& apk -U upgrade \
10+
&& apk add --no-cache \
11+
ada-libs@old-stable \
12+
nodejs@old-stable \
13+
npm@old-stable \
14+
yarn

‎3.5/20/slim/Dockerfile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM ruby:3.5-rc-slim
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
ARG NODE_MAJOR=20
7+
8+
# hadolint ignore=DL3009
9+
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
10+
curl \
11+
gnupg2 \
12+
libatomic1
13+
14+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
15+
16+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
17+
&& mkdir -p /etc/apt/keyrings \
18+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
19+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
20+
&& apt-get update -qq && apt-get install -qq --no-install-recommends \
21+
nodejs \
22+
&& apt-get upgrade -qq \
23+
&& apt-get clean \
24+
&& rm -rf /var/lib/apt/lists/*\
25+
&& npm install -g yarn@1

‎3.5/22/Dockerfile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM ruby:3.5-rc
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
ARG NODE_MAJOR=22
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
13+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
14+
&& apt-get update -qq && apt-get install -qq --no-install-recommends \
15+
nodejs \
16+
&& apt-get upgrade -qq \
17+
&& apt-get clean \
18+
&& rm -rf /var/lib/apt/lists/*\
19+
&& npm install -g yarn@1

‎3.5/22/alpine/Dockerfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ruby:3.5-rc-alpine
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
7+
RUN apk -U upgrade \
8+
&& apk add --no-cache \
9+
nodejs \
10+
npm \
11+
yarn

‎3.5/22/slim/Dockerfile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM ruby:3.5-rc
2+
LABEL maintainer "Tim Brust <[email protected]>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT $REFRESHED_AT
6+
ARG NODE_MAJOR=22
7+
8+
# hadolint ignore=DL3009
9+
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
10+
curl \
11+
gnupg2 \
12+
libatomic1
13+
14+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
15+
16+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
17+
&& mkdir -p /etc/apt/keyrings \
18+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
19+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
20+
&& apt-get update -qq && apt-get install -qq --no-install-recommends \
21+
nodejs \
22+
&& apt-get upgrade -qq \
23+
&& apt-get clean \
24+
&& rm -rf /var/lib/apt/lists/*\
25+
&& npm install -g yarn@1

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Ruby 3.2, 3.3 or 3.4 with Node.js 20 LTS or Node.js 22 Dockerfile
1+
# Ruby 3.2, 3.3, 3.4, 3.5 (RC) with Node.js 20 LTS or Node.js 22 Dockerfile
22

33
[![Docker Automated build](https://img.shields.io/docker/automated/timbru31/ruby-node.svg)](https://hub.docker.com/r/timbru31/ruby-node/)
44
[![buildx Status](https://github.com/timbru31/docker-ruby-node/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-ruby-node/actions?query=workflow%3Abuildx)
55
[![Lint Dockerfiles](https://github.com/timbru31/docker-ruby-node/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-ruby-node/actions?query=workflow%3A%22Lint+Dockerfiles%22)
66

7-
A minimal Dockerfile based on Ruby (3.2, 3.3 or 3.4) Dockerfile (regular, slim or alpine) with Node.js 20 LTS (Iron) or Node.js 22 LTS (Jod) installed.
7+
A minimal Dockerfile based on Ruby (3.2, 3.3, 3.4 or 3.5 (RC)) Dockerfile (regular, slim or alpine) with Node.js 20 LTS (Iron) or Node.js 22 LTS (Jod) installed.
88

99
## What's included
1010

11-
- Ruby 3.2, 3.3, 3.4
11+
- Ruby 3.2, 3.3, 3.4, 3.5 (RC)
1212
- Node.js 20 LTS (Iron) or Node.js 22 LTS (Jod)
1313
- bundled npm that comes with the respective Node.js version (latest for Node.js LTS on alpine, see [why](https://gitlab.alpinelinux.org/alpine/aports/-/commit/25b10bd1a93e12a7e49fee38b0a229281ae49fb7))
1414
- yarn

0 commit comments

Comments
 (0)