From 50f5c9f2ef90219b9260d1458ac9e40fa6416786 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Wed, 16 Feb 2022 16:52:35 +0100
Subject: [PATCH] CI: Refactor build script

---
 Makefile                  | 12 ++++--------
 scripts/deploy-preview.sh |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index bca2fa3fe..e9c39c2a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,3 @@
-.PHONY: all build dev npm dep dep-go dep-js dep-list dep-tensorflow dep-upgrade dep-upgrade-js \
-		test test-js test-go install generate fmt fmt-go fmt-js upgrade start stop \
-		terminal root-terminal packer-digitalocean acceptance clean tidy;
-.SILENT: ;               # no need for @
-.ONESHELL: ;             # recipes execute in same shell
-.NOTPARALLEL: ;          # wait for target to finish
-.EXPORT_ALL_VARIABLES: ; # send all vars to shell
-
 export GO111MODULE=on
 export GODEBUG=http2client=0
 
@@ -286,6 +278,7 @@ docker-goproxy:
 	docker pull golang:alpine
 	scripts/docker/buildx-multi.sh goproxy linux/amd64,linux/arm64 $(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:
@@ -315,3 +308,6 @@ fmt-go:
 	goimports -w pkg internal cmd
 tidy:
 	go mod tidy
+
+.PHONY: all build dev npm dep dep-go dep-js dep-list dep-tensorflow dep-upgrade dep-upgrade-js test test-js test-go \
+install generate fmt fmt-go fmt-js upgrade start stop terminal root-terminal packer-digitalocean acceptance clean tidy;
\ No newline at end of file
diff --git a/scripts/deploy-preview.sh b/scripts/deploy-preview.sh
index b199858e7..7aa0f00f9 100755
--- a/scripts/deploy-preview.sh
+++ b/scripts/deploy-preview.sh
@@ -9,6 +9,5 @@ scripts/test.sh
 make docker-preview
 
 sleep 2
-docker pull photoprism/photoprism:preview
 
 make docker-demo