Skip to content
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

Update software packages #221

Merged
merged 1 commit into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
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
32 changes: 16 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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.3.0
n 22.7.0


# Install Node.js packages
Expand Down Expand Up @@ -61,16 +61,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.4/Python-3.12.4.tgz && \
tar xzf Python-3.12.4.tgz && \
rm --force Python-3.12.4.tgz && \
cd Python-3.12.4 && \
curl --remote-name https://www.python.org/ftp/python/3.12.5/Python-3.12.5.tgz && \
tar xzf Python-3.12.5.tgz && \
rm --force Python-3.12.5.tgz && \
cd Python-3.12.5 && \
CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \
./configure && \
make && \
make install && \
cd .. && \
rm --force --recursive Python-3.12.4 && \
rm --force --recursive Python-3.12.5 && \
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
Expand All @@ -86,16 +86,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.3.tar.gz --output ruby-3.3.3.tar.gz && \
tar xzf ruby-3.3.3.tar.gz && \
rm --force ruby-3.3.3.tar.gz && \
cd ruby-3.3.3 && \
curl https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.gz --output ruby-3.3.4.tar.gz && \
tar xzf ruby-3.3.4.tar.gz && \
rm --force ruby-3.3.4.tar.gz && \
cd ruby-3.3.4 && \
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.3
rm --force --recursive ruby-3.3.4


# Install Ruby packages
Expand All @@ -114,14 +114,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-3460000.zip && \
unzip sqlite-amalgamation-3460000.zip && \
rm --force sqlite-amalgamation-3460000.zip && \
cd sqlite-amalgamation-3460000 && \
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 && \
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-3460000 && \
rm --force --recursive sqlite-amalgamation-3460100 && \
rm --force /tmp/shell.c.patch


Expand Down
2 changes: 1 addition & 1 deletion shell.c.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
30882,30884d30881
30886,30888d30885
< sputf(stdout, "SQLite version %s %.19s%s\n" /*extra-version-info*/
< "Enter \".help\" for usage hints.\n",
< sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET);