Skip to content

Commit be19810

Browse files
committed
merged
2 parents 852ad29 + 463164d commit be19810

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

Dockerfile

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
# Ubuntu version
2+
ARG RELEASE=24.04
3+
14
# Build stage
2-
FROM ubuntu:24.04 AS builder
5+
FROM ubuntu:${RELEASE} as builder
36

47

58
# Build-time variables
@@ -15,14 +18,14 @@ RUN apt update && \
1518
curl
1619

1720

18-
# Install Java 22.x
19-
# http://jdk.java.net/22/
21+
# Install Java 23.x
22+
# http://jdk.java.net/23/
2023
RUN cd /tmp && \
2124
if [ "$BUILDARCH" = "arm64" ]; then ARCH="aarch64"; else ARCH="x64"; fi && \
22-
curl --remote-name https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-${ARCH}_bin.tar.gz && \
23-
tar xzf openjdk-22_linux-${ARCH}_bin.tar.gz && \
24-
rm --force openjdk-22_linux-${ARCH}_bin.tar.gz && \
25-
mv jdk-22 /opt/jdk && \
25+
curl --remote-name https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-${ARCH}_bin.tar.gz && \
26+
tar xzf openjdk-23_linux-${ARCH}_bin.tar.gz && \
27+
rm --force openjdk-23_linux-${ARCH}_bin.tar.gz && \
28+
mv jdk-23 /opt/jdk && \
2629
mkdir --parent /opt/bin && \
2730
ln --symbolic /opt/jdk/bin/* /opt/bin/ && \
2831
chmod a+rx /opt/bin/*
@@ -33,7 +36,7 @@ RUN cd /tmp && \
3336
# https://github.com/tj/n#installation
3437
RUN curl --location https://raw.githubusercontent.com/tj/n/master/bin/n --output /usr/local/bin/n && \
3538
chmod a+x /usr/local/bin/n && \
36-
n 22.6.0
39+
n 22.9.0
3740

3841

3942
# Install Node.js packages
@@ -61,16 +64,16 @@ RUN apt update && \
6164
# Install Python 3.12.x
6265
# https://www.python.org/downloads/
6366
RUN cd /tmp && \
64-
curl --remote-name https://www.python.org/ftp/python/3.12.5/Python-3.12.5.tgz && \
65-
tar xzf Python-3.12.5.tgz && \
66-
rm --force Python-3.12.5.tgz && \
67-
cd Python-3.12.5 && \
67+
curl --remote-name https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tgz && \
68+
tar xzf Python-3.12.7.tgz && \
69+
rm --force Python-3.12.7.tgz && \
70+
cd Python-3.12.7 && \
6871
CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \
6972
./configure && \
7073
make && \
7174
make install && \
7275
cd .. && \
73-
rm --force --recursive Python-3.12.5 && \
76+
rm --force --recursive Python-3.12.7 && \
7477
ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \
7578
ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \
7679
pip3 install --no-cache-dir --upgrade pip
@@ -86,16 +89,16 @@ RUN apt update && \
8689
apt clean && \
8790
rm --force --recursive /var/lib/apt/lists/* && \
8891
cd /tmp && \
89-
curl https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.gz --output ruby-3.3.4.tar.gz && \
90-
tar xzf ruby-3.3.4.tar.gz && \
91-
rm --force ruby-3.3.4.tar.gz && \
92-
cd ruby-3.3.4 && \
92+
curl https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz --output ruby-3.3.5.tar.gz && \
93+
tar xzf ruby-3.3.5.tar.gz && \
94+
rm --force ruby-3.3.5.tar.gz && \
95+
cd ruby-3.3.5 && \
9396
if [ "$BUILDARCH" = "arm64" ]; then ASFLAGS=-mbranch-protection=pac-ret; else ASFLAGS=; fi && \
9497
ASFLAGS=${ASFLAGS} CFLAGS=-Os ./configure --disable-install-doc --enable-load-relative && \
9598
make && \
9699
make install && \
97100
cd .. && \
98-
rm --force --recursive ruby-3.3.4
101+
rm --force --recursive ruby-3.3.5
99102

100103

101104
# Install Ruby packages
@@ -126,7 +129,7 @@ RUN cd /tmp && \
126129
127130
128131
# Final stage
129-
FROM ubuntu:24.04
132+
FROM ubuntu:${RELEASE}
130133
LABEL maintainer="[email protected]"
131134
ARG DEBIAN_FRONTEND=noninteractive
132135

0 commit comments

Comments
 (0)