From 9685b24648bd5d52064c35953742c0c3fc4ce260 Mon Sep 17 00:00:00 2001 From: Ritesh Raj Sarraf Date: Mon, 28 Mar 2022 14:28:38 +0530 Subject: [PATCH] Fix docker-local make target With the adaptation to Debian Bullseye/Bookworm based images, the docker-local make target got broken with below error. ``` rrs@lenovo:~/photoprism-repo (rickysarraf-develop)$ make docker-local scripts/docker/build.sh photoprism Usage: build.sh [name] [tag] [/subimage] make: *** [Makefile:338: docker-local] Error 1 ``` This PR fixes it by introducing the 2 new local targets for Bullseye and Bookworm. And it also aliases the docker-local target to the latest, which right now is Bookworm Signed-off-by: Ritesh Raj Sarraf --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cfcdf6e0f..ef87d89f1 100644 --- a/Makefile +++ b/Makefile @@ -334,8 +334,13 @@ docker-release-impish: docker pull --platform=amd64 ubuntu:impish docker pull --platform=arm64 ubuntu:impish scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish -docker-local: - scripts/docker/build.sh photoprism +docker-local: docker-local-bookworm +docker-local-bullseye: + docker pull photoprism/develop:bullseye + scripts/docker/build.sh photoprism bullseye /bullseye +docker-local-bookworm: + docker pull photoprism/develop:bookworm + scripts/docker/build.sh photoprism bookworm /bookworm docker-pull: docker pull photoprism/photoprism:preview photoprism/photoprism:latest docker-ddns: @@ -378,4 +383,4 @@ tidy: .PHONY: all build dev dep-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 \ docker-develop docker-preview docker-preview-all docker-preview-arm docker-release docker-release-all docker-release-arm \ - install-go install-darktable install-tensorflow devtools tar.gz fix-permissions rootshell; \ No newline at end of file + install-go install-darktable install-tensorflow devtools tar.gz fix-permissions rootshell;