Skip to content

Commit 87d710e

Browse files
committed
fix updater script and pin versions correctly
Signed-off-by: clux <sszynrae@gmail.com>
1 parent a4deb47 commit 87d710e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ RUN chmod a+X /root
5252

5353
# Convenience list of versions and variables for compilation later on
5454
# This helps continuing manually if anything breaks.
55-
ENV SSL_VER="1.1.1q" \
56-
CURL_VER="8.4.0" \
55+
ENV SSL_VER="1.1.1w" \
56+
CURL_VER="8.6.0" \
5757
ZLIB_VER="1.3.1" \
5858
PQ_VER="11.12" \
59-
SQLITE_VER="3430100" \
60-
PROTOC_VER="25.2" \
59+
SQLITE_VER="3450100" \
60+
PROTOBUF_VER="25.2" \
6161
CC=musl-gcc \
6262
PREFIX=/musl \
6363
PATH=/usr/local/bin:/root/.cargo/bin:$PATH \
@@ -66,7 +66,7 @@ ENV SSL_VER="1.1.1q" \
6666

6767
# Install a more recent release of protoc (protobuf-compiler in jammy is 4 years old and misses some features)
6868
RUN cd /tmp && \
69-
curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip -o protoc.zip && \
69+
curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VER}/protoc-${PROTOBUF_VER}-linux-x86_64.zip -o protoc.zip && \
7070
unzip protoc.zip && \
7171
cp bin/protoc /usr/bin/protoc && \
7272
rm -rf *

update_libs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def rustup_version():
8585
'CURL': pkgver('curl'),
8686
#'PQ': pkgver('postgresql-old-upgrade'), # see https://github.com/clux/muslrust/issues/81
8787
'SQLITE': convert_sqlite_version(pkgver('sqlite')),
88-
'SSL': convert_openssl_version(pkgver('openssl')),
88+
'SSL': convert_openssl_version(pkgver('openssl-1.1')),
8989
'PROTOBUF': pkgver('protobuf'),
9090
'ZLIB': pkgver('zlib'),
9191
'RUSTUP': rustup_version()

0 commit comments

Comments
 (0)