From 4c3dcc7e68296520554ba4489881eaef5385c9e2 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@lastzero.net>
Date: Sat, 15 May 2021 15:07:40 +0200
Subject: [PATCH] Dockerfiles: Update arm images and build config

---
 .drone.yml                         | 6 ++++--
 Makefile                           | 1 -
 docker/photoprism/arm32/Dockerfile | 1 +
 docker/photoprism/arm64/Dockerfile | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9d85b09b2..2748c49a6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,7 +60,9 @@ steps:
         from_secret: docker_password
     commands:
       - scripts/docker-login.sh
-      - make docker-photoprism-preview docker-demo
+      - make docker-photoprism-preview
+      - docker pull photoprism/photoprism:preview
+      - make docker-docker-demo
     when:
       status:
         - success
@@ -162,6 +164,6 @@ steps:
         - success
 ---
 kind: signature
-hmac: b68f90a0580da0ea2ba31c90010633ca3216d6c540c7e30f1007ec0688c8fefe
+hmac: 4348a3416fe1ae3bd56f07e92266ef87c865bd8a3438c3a6d7f2cc6fcd8baf63
 
 ...
diff --git a/Makefile b/Makefile
index 423d8363d..1e687e77c 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,6 @@ docker-photoprism-arm32:
 	scripts/docker-build.sh photoprism-arm32 $(DOCKER_TAG)
 	scripts/docker-push.sh photoprism-arm32 $(DOCKER_TAG)
 docker-demo:
-	docker pull photoprism/photoprism:preview
 	scripts/docker-build.sh demo $(DOCKER_TAG)
 	scripts/docker-push.sh demo $(DOCKER_TAG)
 docker-demo-local:
diff --git a/docker/photoprism/arm32/Dockerfile b/docker/photoprism/arm32/Dockerfile
index 78cfacf37..426d0017a 100644
--- a/docker/photoprism/arm32/Dockerfile
+++ b/docker/photoprism/arm32/Dockerfile
@@ -165,6 +165,7 @@ RUN echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin
 
 # Install additional distribution packages
 RUN apt-get update && apt-get upgrade && apt-get install -y --no-install-recommends \
+        gpgv \
         wget \
         curl \
         davfs2 \
diff --git a/docker/photoprism/arm64/Dockerfile b/docker/photoprism/arm64/Dockerfile
index 6560a3001..ec334b5e5 100644
--- a/docker/photoprism/arm64/Dockerfile
+++ b/docker/photoprism/arm64/Dockerfile
@@ -164,6 +164,7 @@ RUN echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin
 
 # Install additional distribution packages
 RUN apt-get update && apt-get upgrade && apt-get install -y --no-install-recommends \
+        gpgv \
         wget \
         curl \
         davfs2 \