aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-06-28 22:50:09 -0600
committerIván Ávalos <avalos@disroot.org>2023-06-28 22:55:33 -0600
commit24862cea7b36ff1433d229e7a30328dc92257770 (patch)
tree1b69096a25f0c3897f14f0b4c862fc325f5a18c0
parent794ad5ba9448c5d42682bea051570af54efd71eb (diff)
downloadquickjs-tart-24862cea7b36ff1433d229e7a30328dc92257770.tar.gz
quickjs-tart-24862cea7b36ff1433d229e7a30328dc92257770.tar.bz2
quickjs-tart-24862cea7b36ff1433d229e7a30328dc92257770.zip
Stop using Debian snapshots for Docker builds
-rwxr-xr-xdocker-android/install.sh2
-rwxr-xr-xdocker-android/prepare.sh18
2 files changed, 10 insertions, 10 deletions
diff --git a/docker-android/install.sh b/docker-android/install.sh
index fb62cd8..85e6002 100755
--- a/docker-android/install.sh
+++ b/docker-android/install.sh
@@ -18,7 +18,7 @@ apt-get install -y --allow-downgrades \
zip
# Needed to build wallet-core
-npm install -g pnpm@6.35.1
+npm install -g pnpm@8.6.3
# Install Android SDK Manager
wget --no-verbose -O cmdline-tools.zip \
diff --git a/docker-android/prepare.sh b/docker-android/prepare.sh
index 60d7043..486eeb8 100755
--- a/docker-android/prepare.sh
+++ b/docker-android/prepare.sh
@@ -2,22 +2,22 @@
set -e
set -x
-# use snapshot repos for deterministic package versions
-DATE="20230220T144122Z"
-cat << EOF > /etc/apt/sources.list
-deb http://snapshot.debian.org/archive/debian/${DATE}/ bookworm main
-deb http://snapshot.debian.org/archive/debian-security/${DATE}/ bookworm-security main
-EOF
+# # use snapshot repos for deterministic package versions
+# DATE="20230220T144122Z"
+# cat << EOF > /etc/apt/sources.list
+# 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)
+# # ignore expired package releases (they expire too fast)
echo 'Acquire::Check-Valid-Until "0";' >> /etc/apt/apt.conf.d/10-ignore-expiry
-# do not install documentation to keep image small
+# # do not install documentation to keep image small
echo "path-exclude=/usr/share/locale/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc
echo "path-exclude=/usr/share/man/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc
echo "path-exclude=/usr/share/doc/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc
-# update package sources
+# # update package sources
apt-get update
apt-get -y upgrade