From 123fa0e43e582288105cfceb11d3bc05aecebbb9 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@lastzero.net>
Date: Tue, 13 Oct 2020 22:46:20 +0200
Subject: [PATCH] CI: Add build targets and improve docker-build.sh

Signed-off-by: Michael Mayer <michael@lastzero.net>
---
 .drone.yml              | 2 +-
 Makefile                | 5 ++++-
 scripts/docker-build.sh | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 71b10367d..1f564b216 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -49,7 +49,7 @@ steps:
         from_secret: docker_password
     commands:
       - scripts/docker-login.sh
-      - make docker-photoprism docker-demo
+      - make docker-photoprism docker-photoprism-pull docker-demo
     when:
       status:
         - success
diff --git a/Makefile b/Makefile
index fb254e23a..da8570846 100644
--- a/Makefile
+++ b/Makefile
@@ -166,12 +166,15 @@ docker-development:
 docker-photoprism:
 	scripts/docker-build.sh photoprism $(DOCKER_TAG)
 	scripts/docker-push.sh photoprism $(DOCKER_TAG)
+docker-photoprism-local:
+	scripts/docker-build.sh photoprism
+docker-photoprism-pull:
+	docker pull photoprism/photoprism:latest
 docker-photoprism-arm64:
 	docker pull ubuntu:20.04
 	scripts/docker-build.sh photoprism-arm64 $(DOCKER_TAG)
 	scripts/docker-push.sh photoprism-arm64 $(DOCKER_TAG)
 docker-demo:
-	docker pull photoprism/photoprism:latest
 	scripts/docker-build.sh demo $(DOCKER_TAG)
 	scripts/docker-push.sh demo $(DOCKER_TAG)
 docker-webdav:
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
index 918609db6..4210b8a6b 100755
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
 
-if [[ -z $1 ]] || [[ -z $2 ]]; then
+if [[ -z $1 ]] && [[ -z $2 ]]; then
     echo "Please provide a container image name and version" 1>&2
     exit 1
+elif [[ $1 ]] && [[ -z $2 ]]; then
+    echo "Building 'photoprism/$1:latest'...";
+    docker build --no-cache --build-arg BUILD_TAG=$2 -t photoprism/$1:latest -f docker/${1/-//}/Dockerfile .
+    echo "Done"
 else
     echo "Building 'photoprism/$1:$2'...";
     docker build --no-cache --build-arg BUILD_TAG=$2 -t photoprism/$1:latest -t photoprism/$1:$2 -f docker/${1/-//}/Dockerfile .