technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Docker: Update versions of Go, Node, PHP, Ruby

Browse Source 
- Go: Drop 1.20, Add 1.22
- Node: Drop 18, Add 21
- PHP: Add 8.3
- Ruby: Add 3.3

Perl and Python are still up-to-date with upstream releases

Regenerating the Dockerfiles also picks up the logging change from
183a1e9d63
This commit is contained in:
Dan Callahan
2024-02-20 12:56:15 +00:00
committed by Dan Callahan
parent 914cd4e354
commit d52a9361a8
16 changed files with 199 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/docker/Dockerfile.go1.21
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

6
pkg/docker/Dockerfile.go1.20 → pkg/docker/Dockerfile.go1.22
View File

@@ -1,6 +1,6 @@
FROM golang:1.20-bullseye FROM golang:1.22-bullseye
LABEL org.opencontainers.image.title="Unit (go1.20)" LABEL org.opencontainers.image.title="Unit (go1.22)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit" LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.jsc11
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.minimal
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.node20
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

6
pkg/docker/Dockerfile.node18 → pkg/docker/Dockerfile.node21
View File

@@ -1,6 +1,6 @@
FROM node:18-bullseye FROM node:21-bullseye
LABEL org.opencontainers.image.title="Unit (node18)" LABEL org.opencontainers.image.title="Unit (node21)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit" LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.perl5.36
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.perl5.38
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.php8.2
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

89
pkg/docker/Dockerfile.php8.3 Normal file
View File

@@ -0,0 +1,89 @@
FROM php:8.3-cli-bullseye
LABEL org.opencontainers.image.title="Unit (php8.3)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.31.1"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& git clone --depth 1 -b 1.31.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
&& make clean \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
&& make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure php \
&& make -j $NCPU php-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure php \
&& make -j $NCPU php-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& ldconfig \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

2
pkg/docker/Dockerfile.python3.11
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.python3.12
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

2
pkg/docker/Dockerfile.ruby3.2
View File

@@ -77,7 +77,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

89
pkg/docker/Dockerfile.ruby3.3 Normal file
View File

@@ -0,0 +1,89 @@
FROM ruby:3.3-bullseye
LABEL org.opencontainers.image.title="Unit (ruby3.3)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.31.1"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& git clone --depth 1 -b 1.31.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
&& make clean \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
&& make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure ruby \
&& make -j $NCPU ruby-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure ruby \
&& make -j $NCPU ruby-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& gem install rack && rm -rf /root/.local \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

2
pkg/docker/Dockerfile.wasm
View File

@@ -97,7 +97,7 @@ RUN set -ex \
&& apt-get purge -y --auto-remove build-essential \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stderr /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/ COPY welcome.* /usr/share/unit/welcome/

8
pkg/docker/Makefile
View File

@@ -19,7 +19,7 @@ INSTALL_minimal ?= version
RUN_minimal ?= /bin/true RUN_minimal ?= /bin/true
MODULE_PREBUILD_minimal ?= /bin/true MODULE_PREBUILD_minimal ?= /bin/true
VERSIONS_go ?= 1.20 1.21 VERSIONS_go ?= 1.21 1.22
VARIANT_go ?= $(VARIANT) VARIANT_go ?= $(VARIANT)
$(foreach goversion, $(VERSIONS_go), $(eval CONTAINER_go$(goversion) = golang:$(goversion)-$(VARIANT_go))) $(foreach goversion, $(VERSIONS_go), $(eval CONTAINER_go$(goversion) = golang:$(goversion)-$(VARIANT_go)))
CONFIGURE_go ?= go --go-path=$$GOPATH CONFIGURE_go ?= go --go-path=$$GOPATH
@@ -35,7 +35,7 @@ INSTALL_jsc ?= java-shared-install java-install
RUN_jsc ?= rm -rf /root/.m2 RUN_jsc ?= rm -rf /root/.m2
MODULE_PREBUILD_jsc ?= /bin/true MODULE_PREBUILD_jsc ?= /bin/true
VERSIONS_node ?= 18 20 VERSIONS_node ?= 20 21
VARIANT_node ?= $(VARIANT) VARIANT_node ?= $(VARIANT)
$(foreach nodeversion, $(VERSIONS_node), $(eval CONTAINER_node$(nodeversion) = node:$(nodeversion)-$(VARIANT_node))) $(foreach nodeversion, $(VERSIONS_node), $(eval CONTAINER_node$(nodeversion) = node:$(nodeversion)-$(VARIANT_node)))
CONFIGURE_node ?= nodejs --node-gyp=/usr/local/bin/node-gyp CONFIGURE_node ?= nodejs --node-gyp=/usr/local/bin/node-gyp
@@ -51,7 +51,7 @@ INSTALL_perl ?= perl-install
RUN_perl ?= /bin/true RUN_perl ?= /bin/true
MODULE_PREBUILD_perl ?= /bin/true MODULE_PREBUILD_perl ?= /bin/true
VERSIONS_php ?= 8.2 VERSIONS_php ?= 8.2 8.3
VARIANT_php ?= cli-$(VARIANT) VARIANT_php ?= cli-$(VARIANT)
$(foreach phpversion, $(VERSIONS_php), $(eval CONTAINER_php$(phpversion) = php:$(phpversion)-$(VARIANT_php))) $(foreach phpversion, $(VERSIONS_php), $(eval CONTAINER_php$(phpversion) = php:$(phpversion)-$(VARIANT_php)))
CONFIGURE_php ?= php CONFIGURE_php ?= php
@@ -67,7 +67,7 @@ INSTALL_python ?= python3-install
RUN_python ?= /bin/true RUN_python ?= /bin/true
MODULE_PREBUILD_python ?= /bin/true MODULE_PREBUILD_python ?= /bin/true
VERSIONS_ruby ?= 3.2 VERSIONS_ruby ?= 3.2 3.3
VARIANT_ruby ?= $(VARIANT) VARIANT_ruby ?= $(VARIANT)
$(foreach rubyversion, $(VERSIONS_ruby), $(eval CONTAINER_ruby$(rubyversion) = ruby:$(rubyversion)-$(VARIANT_ruby))) $(foreach rubyversion, $(VERSIONS_ruby), $(eval CONTAINER_ruby$(rubyversion) = ruby:$(rubyversion)-$(VARIANT_ruby)))
CONFIGURE_ruby ?= ruby CONFIGURE_ruby ?= ruby