diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index b12f917..bb00cbb 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ["3.2", "3.3", "3.4", "4.0"] + ruby-version: ["3.3", "3.4", "4.0"] node-version: [22, 24, 26] variant: [default, slim, alpine] include: diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index feb68f0..b0d3ec1 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ["3.2", "3.3", "3.4", "4.0"] + ruby-version: ["3.3", "3.4", "4.0"] node-version: [22, 24, 26] variant: [default, slim, alpine] diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 8ccd468..0156d84 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -15,5 +15,5 @@ jobs: - run: brew install hadolint - run: | - hadolint {3.2,3.3,3.4,4.0}/**/*Dockerfile - hadolint {3.2,3.3,3.4,4.0}/**/**/*Dockerfile + hadolint {3.3,3.4,4.0}/**/*Dockerfile + hadolint {3.3,3.4,4.0}/**/**/*Dockerfile diff --git a/3.2/22/Dockerfile b/3.2/22/Dockerfile deleted file mode 100644 index b3e1a33..0000000 --- a/3.2/22/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ruby:3.2 -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=22 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/3.2/22/alpine/Dockerfile b/3.2/22/alpine/Dockerfile deleted file mode 100644 index d011905..0000000 --- a/3.2/22/alpine/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM ruby:3.2-alpine -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT - -RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ - && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ - && apk -U upgrade \ - && apk add --no-cache \ - ada-libs@old-stable \ - nodejs@old-stable \ - npm@old-stable \ - yarn diff --git a/3.2/22/slim/Dockerfile b/3.2/22/slim/Dockerfile deleted file mode 100644 index 242722d..0000000 --- a/3.2/22/slim/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ruby:3.2-slim -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=22 - -# hadolint ignore=DL3009 -RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - curl \ - gnupg2 \ - libatomic1 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/3.2/24/Dockerfile b/3.2/24/Dockerfile deleted file mode 100644 index 42ed535..0000000 --- a/3.2/24/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ruby:3.2 -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=24 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/3.2/24/alpine/Dockerfile b/3.2/24/alpine/Dockerfile deleted file mode 100644 index 33c6a0a..0000000 --- a/3.2/24/alpine/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ruby:3.2-alpine -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT - -RUN apk -U upgrade \ - && apk add --no-cache \ - nodejs \ - npm \ - yarn diff --git a/3.2/24/slim/Dockerfile b/3.2/24/slim/Dockerfile deleted file mode 100644 index 546a8cb..0000000 --- a/3.2/24/slim/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ruby:3.2-slim -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=24 - -# hadolint ignore=DL3009 -RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - curl \ - gnupg2 \ - libatomic1 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/3.2/26/Dockerfile b/3.2/26/Dockerfile deleted file mode 100644 index b61bb2c..0000000 --- a/3.2/26/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ruby:3.2 -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=26 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/3.2/26/alpine/Dockerfile b/3.2/26/alpine/Dockerfile deleted file mode 100644 index f908220..0000000 --- a/3.2/26/alpine/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:3.2-alpine -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT - -RUN echo @3.24 https://dl-cdn.alpinelinux.org/alpine/v3.24/community >> /etc/apk/repositories \ - && echo @3.24 https://dl-cdn.alpinelinux.org/alpine/v3.24/main >> /etc/apk/repositories \ - && apk -U upgrade \ - && apk add --no-cache \ - nodejs-current@3.24 \ - npm@3.24 \ - yarn@3.24 diff --git a/3.2/26/slim/Dockerfile b/3.2/26/slim/Dockerfile deleted file mode 100644 index ad61f9d..0000000 --- a/3.2/26/slim/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ruby:3.2-slim -LABEL maintainer="Tim Prüssing " - -ARG REFRESHED_AT -ENV REFRESHED_AT=$REFRESHED_AT -ARG NODE_MAJOR=26 - -# hadolint ignore=DL3009 -RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - curl \ - gnupg2 \ - libatomic1 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && 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 \ - && apt-get update -qq && apt-get install -qq --no-install-recommends \ - nodejs \ - && apt-get upgrade -qq \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/*\ - && npm install -g yarn@1 diff --git a/README.md b/README.md index d8b9240..e0ca4a1 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# Ruby 3.2, 3.3, 3.4, 4.0 with Node.js 22 LTS, Node.js 24 LTS or Node.js 26 Dockerfile +# Ruby 3.3, 3.4, 4.0 with Node.js 22 LTS, Node.js 24 LTS or Node.js 26 Dockerfile [![Docker Automated build](https://img.shields.io/docker/automated/timbru31/ruby-node.svg)](https://hub.docker.com/r/timbru31/ruby-node/) [![buildx Status](https://github.com/timbru31/docker-ruby-node/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-ruby-node/actions?query=workflow%3Abuildx) [![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) -A minimal Dockerfile based on Ruby (3.2, 3.3, 3.4 or 4.0) Dockerfile (regular, slim or alpine) with Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) installed. +A minimal Dockerfile based on Ruby (3.3, 3.4 or 4.0) Dockerfile (regular, slim or alpine) with Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) installed. ## What's included -- Ruby 3.2, 3.3, 3.4, 4.0 +- Ruby 3.3, 3.4, 4.0 - Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) - 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)) - yarn