Skip to content

Commit 8e025bf

Browse files
authored
Merge pull request #232 from cs50/upgrade-versions
Versions Upgrade
2 parents a8cdf70 + 6277163 commit 8e025bf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Dockerfile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ RUN apt update && \
2222
# http://jdk.java.net/24/
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/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-${ARCH}_bin.tar.gz && \
26-
tar xzf openjdk-24_linux-${ARCH}_bin.tar.gz && \
27-
rm --force openjdk-24_linux-${ARCH}_bin.tar.gz && \
28-
mv jdk-24 /opt/jdk && \
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 && \
2929
mkdir --parent /opt/bin && \
3030
ln --symbolic /opt/jdk/bin/* /opt/bin/ && \
3131
chmod a+rx /opt/bin/*
@@ -36,7 +36,7 @@ RUN cd /tmp && \
3636
# https://github.com/tj/n#installation
3737
RUN curl --location https://raw.githubusercontent.com/tj/n/master/bin/n --output /usr/local/bin/n && \
3838
chmod a+x /usr/local/bin/n && \
39-
n 22.16.0
39+
n 22.19.0
4040

4141

4242
# Install Node.js packages
@@ -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.5/Python-3.13.5.tgz && \
68-
tar xzf Python-3.13.5.tgz && \
69-
rm --force Python-3.13.5.tgz && \
70-
cd Python-3.13.5 && \
67+
curl --remote-name https://www.python.org/ftp/python/3.13.7/Python-3.13.7.tgz && \
68+
tar xzf Python-3.13.7.tgz && \
69+
rm --force Python-3.13.7.tgz && \
70+
cd Python-3.13.7 && \
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.5 && \
76+
rm --force --recursive Python-3.13.7 && \
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-3490200.zip && \
121-
unzip sqlite-amalgamation-3490200.zip && \
122-
rm --force sqlite-amalgamation-3490200.zip && \
123-
cd sqlite-amalgamation-3490200 && \
120+
curl --remote-name https://www.sqlite.org/2025/sqlite-amalgamation-3500400.zip && \
121+
unzip sqlite-amalgamation-3500400.zip && \
122+
rm --force sqlite-amalgamation-3500400.zip && \
123+
cd sqlite-amalgamation-3500400 && \
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-3490200 && \
127+
rm --force --recursive sqlite-amalgamation-3500400 && \
128128
rm --force /tmp/shell.c.patch
129129
130130

shell.c.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@@ -33502,10 +33502,6 @@
1+
@@ -33794,10 +33794,6 @@
22
char *zHome;
33
char *zHistory;
44
int nHistory;

0 commit comments

Comments
 (0)