Skip to content

Upgrade Versions #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ jobs:

finalize:
needs: [build-amd64, build-arm64]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Log into Docker Hub
uses: docker/login-action@v3
40 changes: 20 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ RUN apt update && \
# http://jdk.java.net/23/
RUN cd /tmp && \
if [ "$BUILDARCH" = "arm64" ]; then ARCH="aarch64"; else ARCH="x64"; fi && \
curl --remote-name https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-${ARCH}_bin.tar.gz && \
tar xzf openjdk-23_linux-${ARCH}_bin.tar.gz && \
rm --force openjdk-23_linux-${ARCH}_bin.tar.gz && \
mv jdk-23 /opt/jdk && \
curl --remote-name https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL/openjdk-23.0.1_linux-${ARCH}_bin.tar.gz && \
tar xzf openjdk-23.0.1_linux-${ARCH}_bin.tar.gz && \
rm --force openjdk-23.0.1_linux-${ARCH}_bin.tar.gz && \
mv jdk-23.0.1 /opt/jdk && \
mkdir --parent /opt/bin && \
ln --symbolic /opt/jdk/bin/* /opt/bin/ && \
chmod a+rx /opt/bin/*
@@ -36,7 +36,7 @@ RUN cd /tmp && \
# https://github.com/tj/n#installation
RUN curl --location https://raw.githubusercontent.com/tj/n/master/bin/n --output /usr/local/bin/n && \
chmod a+x /usr/local/bin/n && \
n 22.6.0
n 22.12.0


# Install Node.js packages
@@ -64,16 +64,16 @@ RUN apt update && \
# Install Python 3.12.x
# https://www.python.org/downloads/
RUN cd /tmp && \
curl --remote-name https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tgz && \
tar xzf Python-3.12.7.tgz && \
rm --force Python-3.12.7.tgz && \
cd Python-3.12.7 && \
curl --remote-name https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tgz && \
tar xzf Python-3.12.8.tgz && \
rm --force Python-3.12.8.tgz && \
cd Python-3.12.8 && \
CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \
./configure && \
make && \
make install && \
cd .. && \
rm --force --recursive Python-3.12.7 && \
rm --force --recursive Python-3.12.8 && \
ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \
ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \
pip3 install --no-cache-dir --upgrade pip
@@ -89,16 +89,16 @@ RUN apt update && \
apt clean && \
rm --force --recursive /var/lib/apt/lists/* && \
cd /tmp && \
curl https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz --output ruby-3.3.5.tar.gz && \
tar xzf ruby-3.3.5.tar.gz && \
rm --force ruby-3.3.5.tar.gz && \
cd ruby-3.3.5 && \
curl https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz --output ruby-3.3.6.tar.gz && \
tar xzf ruby-3.3.6.tar.gz && \
rm --force ruby-3.3.6.tar.gz && \
cd ruby-3.3.6 && \
if [ "$BUILDARCH" = "arm64" ]; then ASFLAGS=-mbranch-protection=pac-ret; else ASFLAGS=; fi && \
ASFLAGS=${ASFLAGS} CFLAGS=-Os ./configure --disable-install-doc --enable-load-relative && \
make && \
make install && \
cd .. && \
rm --force --recursive ruby-3.3.5
rm --force --recursive ruby-3.3.6


# Install Ruby packages
@@ -117,14 +117,14 @@ RUN echo "gem: --no-document" > /etc/gemrc && \
# https://www.sqlite.org/howtocompile.html#compiling_the_command_line_interface
COPY shell.c.patch /tmp
RUN cd /tmp && \
curl --remote-name https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip && \
unzip sqlite-amalgamation-3460100.zip && \
rm --force sqlite-amalgamation-3460100.zip && \
cd sqlite-amalgamation-3460100 && \
curl --remote-name https://www.sqlite.org/2024/sqlite-amalgamation-3470200.zip && \
unzip sqlite-amalgamation-3470200.zip && \
rm --force sqlite-amalgamation-3470200.zip && \
cd sqlite-amalgamation-3470200 && \
patch shell.c < /tmp/shell.c.patch && \
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 && \
cd .. && \
rm --force --recursive sqlite-amalgamation-3460100 && \
rm --force --recursive sqlite-amalgamation-3470200 && \
rm --force /tmp/shell.c.patch


5 changes: 3 additions & 2 deletions shell.c.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
30886,30888d30885
< sputf(stdout, "SQLite version %s %.19s%s\n" /*extra-version-info*/
33142,33145d33141
< sqlite3_fprintf(stdout,
< "SQLite version %s %.19s%s\n" /*extra-version-info*/
< "Enter \".help\" for usage hints.\n",
< sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET);