Skip to content

Commit d61fa88

Browse files
authored
Merge pull request #235 from cs50/updates
Updates Python, SQLite, Java
2 parents 4283e36 + bbab40b commit d61fa88

File tree

2 files changed

+16
-117
lines changed

2 files changed

+16
-117
lines changed

Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ RUN apt update && \
1818
curl
1919

2020

21-
# Install Java 24.x
22-
# http://jdk.java.net/24/
21+
# Install Java 25.x
22+
# https://jdk.java.net/25/
2323
RUN cd /tmp && \
2424
if [ "$BUILDARCH" = "arm64" ]; then ARCH="aarch64"; else ARCH="x64"; fi && \
25-
curl --remote-name https://download.java.net/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_linux-${ARCH}_bin.tar.gz && \
26-
tar xzf openjdk-24.0.2_linux-${ARCH}_bin.tar.gz && \
27-
rm --force openjdk-24.0.2_linux-${ARCH}_bin.tar.gz && \
28-
mv jdk-24.0.2 /opt/jdk && \
25+
curl --remote-name https://download.java.net/java/GA/jdk25.0.2/b1e0dfa218384cb9959bdcb897162d4e/10/GPL/openjdk-25.0.2_linux-${ARCH}_bin.tar.gz && \
26+
tar xzf openjdk-25.0.2_linux-${ARCH}_bin.tar.gz && \
27+
rm --force openjdk-25.0.2_linux-${ARCH}_bin.tar.gz && \
28+
mv jdk-25.0.2 /opt/jdk && \
2929
mkdir --parent /opt/bin && \
3030
ln --symbolic /opt/jdk/bin/* /opt/bin/ && \
3131
chmod a+rx /opt/bin/*
@@ -64,16 +64,16 @@ RUN apt update && \
6464
# Install Python 3.13.x
6565
# https://www.python.org/downloads/
6666
RUN cd /tmp && \
67-
curl --remote-name https://www.python.org/ftp/python/3.13.11/Python-3.13.11.tgz && \
68-
tar xzf Python-3.13.11.tgz && \
69-
rm --force Python-3.13.11.tgz && \
70-
cd Python-3.13.11 && \
67+
curl --remote-name https://www.python.org/ftp/python/3.13.12/Python-3.13.12.tgz && \
68+
tar xzf Python-3.13.12.tgz && \
69+
rm --force Python-3.13.12.tgz && \
70+
cd Python-3.13.12 && \
7171
CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \
7272
./configure && \
7373
make && \
7474
make install && \
7575
cd .. && \
76-
rm --force --recursive Python-3.13.11 && \
76+
rm --force --recursive Python-3.13.12 && \
7777
ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \
7878
ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \
7979
pip3 install --no-cache-dir --upgrade pip
@@ -117,14 +117,14 @@ RUN echo "gem: --no-document" > /etc/gemrc && \
117117
# https://www.sqlite.org/howtocompile.html#compiling_the_command_line_interface
118118
COPY shell.c.patch /tmp
119119
RUN cd /tmp && \
120-
curl --remote-name https://www.sqlite.org/2025/sqlite-amalgamation-3510100.zip && \
121-
unzip sqlite-amalgamation-3510100.zip && \
122-
rm --force sqlite-amalgamation-3510100.zip && \
123-
cd sqlite-amalgamation-3510100 && \
120+
curl --remote-name https://www.sqlite.org/2026/sqlite-amalgamation-3510200.zip && \
121+
unzip sqlite-amalgamation-3510200.zip && \
122+
rm --force sqlite-amalgamation-3510200.zip && \
123+
cd sqlite-amalgamation-3510200 && \
124124
patch shell.c < /tmp/shell.c.patch && \
125125
gcc -D HAVE_READLINE -D SQLITE_DEFAULT_FOREIGN_KEYS=1 -D SQLITE_OMIT_DYNAPROMPT=1 shell.c sqlite3.c -lpthread -ldl -lm -lreadline -lncurses -o /usr/local/bin/sqlite3 && \
126126
cd .. && \
127-
rm --force --recursive sqlite-amalgamation-3510100 && \
127+
rm --force --recursive sqlite-amalgamation-3510200 && \
128128
rm --force /tmp/shell.c.patch
129129

130130

Dockerfile.temp

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)