mirror of
https://github.com/photoprism/photoprism.git
synced 2025-09-26 21:01:58 +08:00
Develop: Upgrade base image from 250418-plucky to 250426-plucky #4967
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# Ubuntu 25.04 (Plucky Puffin)
|
||||
FROM photoprism/develop:250418-plucky
|
||||
FROM photoprism/develop:250426-plucky
|
||||
|
||||
## Alternative Environments:
|
||||
# FROM photoprism/develop:armv7 # ARMv7 (32bit)
|
||||
|
26
Makefile
26
Makefile
@@ -404,21 +404,19 @@ docker-build:
|
||||
$(DOCKER_COMPOSE) --profile=all pull --ignore-pull-failures
|
||||
$(DOCKER_COMPOSE) build --pull
|
||||
docker-nvidia: docker-nvidia-up
|
||||
docker-nvidia-up:
|
||||
docker compose --profile=qdrant -f compose.nvidia.yaml up
|
||||
docker-nvidia-down:
|
||||
docker compose --profile=qdrant -f compose.nvidia.yaml down --remove-orphans
|
||||
docker-nvidia-build:
|
||||
docker compose --profile=qdrant -f compose.nvidia.yaml build
|
||||
$(DOCKER_COMPOSE) --profile=qdrant -f compose.nvidia.yaml build
|
||||
docker-nvidia-up:
|
||||
$(DOCKER_COMPOSE) --profile=qdrant -f compose.nvidia.yaml up
|
||||
docker-nvidia-down:
|
||||
$(DOCKER_COMPOSE) --profile=qdrant -f compose.nvidia.yaml down --remove-orphans
|
||||
docker-intel: docker-intel-up
|
||||
docker-intel-up:
|
||||
docker compose -f compose.intel.yaml up
|
||||
docker-intel-build:
|
||||
docker compose -f compose.intel.yaml build
|
||||
docker-local-up:
|
||||
$(DOCKER_COMPOSE) -f compose.local.yaml up --force-recreate
|
||||
docker-local-down:
|
||||
$(DOCKER_COMPOSE) -f compose.local.yaml down -V
|
||||
$(DOCKER_COMPOSE) -f compose.intel.yaml build
|
||||
docker-intel-up:
|
||||
$(DOCKER_COMPOSE) -f compose.intel.yaml up
|
||||
docker-intel-down:
|
||||
$(DOCKER_COMPOSE) -f compose.intel.yaml down --remove-orphans
|
||||
develop: docker-develop
|
||||
docker-develop: docker-develop-latest
|
||||
docker-develop-all: docker-develop-latest docker-develop-other
|
||||
@@ -714,6 +712,10 @@ terminal-preview:
|
||||
logs-preview:
|
||||
$(DOCKER_COMPOSE) -f compose.preview.yaml logs -f photoprism-preview
|
||||
docker-local: docker-local-plucky
|
||||
docker-local-up:
|
||||
$(DOCKER_COMPOSE) -f compose.local.yaml up --force-recreate
|
||||
docker-local-down:
|
||||
$(DOCKER_COMPOSE) -f compose.local.yaml down --remove-orphans
|
||||
docker-local-all: docker-local-plucky docker-local-oracular docker-local-noble docker-local-mantic docker-local-lunar docker-local-jammy docker-local-bookworm docker-local-bullseye docker-local-buster
|
||||
docker-local-bookworm:
|
||||
docker pull photoprism/develop:bookworm
|
||||
|
@@ -124,7 +124,6 @@ services:
|
||||
- ".:/go/src/github.com/photoprism/photoprism"
|
||||
- "./storage:/photoprism"
|
||||
- "go-mod:/go/pkg/mod"
|
||||
|
||||
mariadb:
|
||||
extends:
|
||||
file: ./compose.yaml
|
||||
@@ -133,6 +132,10 @@ services:
|
||||
extends:
|
||||
file: ./compose.yaml
|
||||
service: qdrant
|
||||
photoprism-vision:
|
||||
extends:
|
||||
file: ./compose.yaml
|
||||
service: photoprism-vision
|
||||
traefik:
|
||||
extends:
|
||||
file: ./compose.yaml
|
||||
@@ -164,9 +167,3 @@ volumes:
|
||||
driver: local
|
||||
mariadb:
|
||||
driver: local
|
||||
|
||||
## Create shared "photoprism-develop" network for connecting with services in other compose.yaml files
|
||||
networks:
|
||||
default:
|
||||
name: photoprism
|
||||
driver: bridge
|
||||
|
Reference in New Issue
Block a user