beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix docker-local make target

Browse source 
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 <rrs@researchut.com>
This commit is contained in:
Ritesh Raj Sarraf 2022-03-28 14:28:38 +05:30
parent 736b03f87f
commit 9685b24648
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -334,8 +334,13 @@ docker-release-impish:
docker pull --platform=amd64 ubuntu:impish docker pull --platform=amd64 ubuntu:impish
docker pull --platform=arm64 ubuntu:impish docker pull --platform=arm64 ubuntu:impish
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish
docker-local: docker-local: docker-local-bookworm
scripts/docker/build.sh photoprism 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:
docker pull photoprism/photoprism:preview photoprism/photoprism:latest docker pull photoprism/photoprism:preview photoprism/photoprism:latest
docker-ddns: 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 \ .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 \ 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 \ 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; install-go install-darktable install-tensorflow devtools tar.gz fix-permissions rootshell;