summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-02-21 15:07:49 +0100
committerFlorian Dold <florian@dold.me>2023-02-21 15:07:49 +0100
commit8a0be42250f84f922cbb9aa8a4ccf6d841d5c2f6 (patch)
tree8897cfdb4102d3aa46474255aac0020defbfa57a
parent8745f00349955c39465cf194c52d12449a83b176 (diff)
downloadquickjs-tart-8a0be42250f84f922cbb9aa8a4ccf6d841d5c2f6.tar.gz
quickjs-tart-8a0be42250f84f922cbb9aa8a4ccf6d841d5c2f6.tar.bz2
quickjs-tart-8a0be42250f84f922cbb9aa8a4ccf6d841d5c2f6.zip
docker-android: use bookworm, as we need a newer node version
-rw-r--r--docker-android/Dockerfile2
-rwxr-xr-xdocker-android/install.sh5
-rwxr-xr-xdocker-android/prepare.sh7
3 files changed, 5 insertions, 9 deletions
diff --git a/docker-android/Dockerfile b/docker-android/Dockerfile
index 8afd687..bbdb498 100644
--- a/docker-android/Dockerfile
+++ b/docker-android/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
diff --git a/docker-android/install.sh b/docker-android/install.sh
index e37babf..fb62cd8 100755
--- a/docker-android/install.sh
+++ b/docker-android/install.sh
@@ -4,7 +4,6 @@ set -x
# Install dependencies
apt-get install -y --allow-downgrades \
- libssl1.1=1.1.1n-0+deb11u3 \
clang \
curl \
default-jdk-headless \
@@ -12,14 +11,12 @@ apt-get install -y --allow-downgrades \
gnupg \
jq \
make \
+ meson \
npm \
unzip \
wget \
zip
-apt-get install -y --no-install-recommends \
- meson -t bullseye-backports
-
# Needed to build wallet-core
npm install -g pnpm@6.35.1
diff --git a/docker-android/prepare.sh b/docker-android/prepare.sh
index 9efd492..60d7043 100755
--- a/docker-android/prepare.sh
+++ b/docker-android/prepare.sh
@@ -3,11 +3,10 @@ set -e
set -x
# use snapshot repos for deterministic package versions
-DATE="20230123T040022Z"
+DATE="20230220T144122Z"
cat << EOF > /etc/apt/sources.list
-deb http://snapshot.debian.org/archive/debian/${DATE}/ bullseye main
-deb http://snapshot.debian.org/archive/debian/${DATE}/ bullseye-backports main
-deb http://snapshot.debian.org/archive/debian-security/${DATE}/ bullseye-security main
+deb http://snapshot.debian.org/archive/debian/${DATE}/ bookworm main
+deb http://snapshot.debian.org/archive/debian-security/${DATE}/ bookworm-security main
EOF
# ignore expired package releases (they expire too fast)