Merge remote-tracking branch 'origin/add_choose_spool_provider' into …

…devel
katzenpost · Dec 25, 2022 · 8652c88 · 8652c88
2 parents 9fa4c4a + d27819d
commit 8652c88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile.android b/Dockerfile.android
@@ -3,6 +3,7 @@ FROM docker.io/golang:bullseye AS builder
 LABEL authors="Masala: masala@riseup.net"
 
 # Install build requirements and JDK
+RUN echo 'deb https://deb.debian.org/debian bullseye main\ndeb https://deb.debian.org/debian bullseye-updates main\ndeb https://deb.debian.org/debian-security bullseye-security main' > /etc/apt/sources.list && cat /etc/apt/sources.list
 RUN apt update \
 && apt install --no-install-recommends -y git make ca-certificates \
 openjdk-11-jdk openjdk-11-jre-headless build-essential libgles2 \

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ docker-build-windows: docker-go-mod
 
 docker-android-base:
 	if ! $(docker) images|grep katzen/android_sdk; then \
-		$(docker) build --no-cache -t katzen/android_sdk -f Dockerfile.android .; \
+		$(docker) build -t katzen/android_sdk -f Dockerfile.android .; \
 	fi
 
 android-signing-key: docker-android-base