From 7097c252764fb59fa5b2b92f234e26086ab1f097 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 10 Dec 2021 21:32:51 +0100 Subject: [PATCH] Docker: Update ARMv7 docker-compose.yml example and READMEs --- docker/examples/arm64/README | 42 +++++++++++------------- docker/examples/armv7/README | 38 ++++++++++----------- docker/examples/armv7/docker-compose.yml | 2 +- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/docker/examples/arm64/README b/docker/examples/arm64/README index 4d9f24766..973195564 100644 --- a/docker/examples/arm64/README +++ b/docker/examples/arm64/README @@ -1,30 +1,20 @@ -# Running PhotoPrism on a Raspberry Pi 3 / 4 or other ARM64-based devices (64-bit) +# Running PhotoPrism on Modern ARM64-based Devices (64-bit) -Our stable version and development preview now come as a single multi-arch image for AMD64 and ARM64: +Our stable version and development preview now come as a single multi-arch image for AMD64 and ARM64 (64-bit). - https://hub.docker.com/r/photoprism/photoprism +Stable Release : photoprism/photoprism:latest +Development Preview: photoprism/photoprism:preview +MariaDB : arm64v8/mariadb:10.6 If your device meets the system requirements, mostly the same installation instructions as for regular Linux -servers apply: - - https://docs.photoprism.org/getting-started/docker-compose/ - -Pull from `photoprism/photoprism:latest` for the stable release and `photoprism/photoprism:preview` for testing -preview builds. Make sure to explicitly pull the most recent image from Docker Hub. Existing users are advised to -update their `docker-compose.yml` config based on our example: - - https://dl.photoprism.org/docker/arm64/docker-compose.yml - -To ensure compatibility with 64-bit Docker images, you have to boot your Pi with -the "arm_64bit=1" flag in its "config.txt": - - https://www.raspberrypi.org/documentation/installation/installing-images/README.md +servers apply: https://docs.photoprism.org/getting-started/docker-compose/ +To ensure compatibility with 64-bit Docker images, your Raspberry Pi 3 / 4 must boot with the "arm_64bit=1" +flag in its config.txt file (https://www.raspberrypi.org/documentation/installation/installing-images/README.md). An "exec format error" will occur otherwise. -Alternatively, you can install UbuntuDockerPi - it's a 64-bit Ubuntu with Docker pre-configured: - - https://github.com/guysoft/UbuntuDockerPi +Alternatively, you can run your device with [UbuntuDockerPi](https://github.com/guysoft/UbuntuDockerPi). +It's a 64-bit Ubuntu Server with Docker pre-configured. ### System Requirements ### @@ -58,5 +48,13 @@ Alternatively, you can install UbuntuDockerPi - it's a 64-bit Ubuntu with Docker `PHOTOPRISM_WORKERS` to a reasonably small value in `docker-compose.yml` (depending on the performance of the server). As a measure of last resort, you may disable using TensorFlow for image classification and facial recognition. -Big thank you to [Guy Sheffer](https://github.com/guysoft) -for [building](https://github.com/photoprism/photoprism/issues/109) this! +### Getting Updates ### + +If an old version is running on your device and doesn't update, you need to [explicitly pull](updates.md) +the latest image from [Docker Hub](https://hub.docker.com/r/photoprism/photoprism). Assuming that `:latest` +means new versions are automatically downloaded is a common mistake for users new to Docker. + +### Credits ### + +A big thank you to [Guy Sheffer](https://github.com/guysoft) for helping us [build](https://github.com/photoprism/photoprism/issues/109) +a Raspberry Pi version! diff --git a/docker/examples/armv7/README b/docker/examples/armv7/README index 7c6b7b43e..a94889b44 100644 --- a/docker/examples/armv7/README +++ b/docker/examples/armv7/README @@ -1,22 +1,14 @@ -# Running PhotoPrism on an older Raspberry Pi or other ARMv7-based devices (32-bit) +# Running PhotoPrism on Older ARMv7-based Devices (32-bit) + +You have to revert to alternative Docker images to run PhotoPrism and MariaDB on old ARMv7-based devices or modern +Raspberrys with an old 32-bit operating system. Pay close attention to changed directory and environment variable names. + +Stable Release : photoprism/photoprism:armv7 +Development Preview: photoprism/photoprism:armv7-preview +MariaDB : linuxserver/mariadb:latest If your device meets the system requirements, mostly the same installation instructions as for regular Linux -servers apply: - - https://docs.photoprism.org/getting-started/docker-compose/ - -Pull from `photoprism/photoprism:armv7` for the stable release and `photoprism/photoprism:armv7-preview` for testing -preview builds. Make sure to explicitly pull the most recent image from Docker Hub. Existing users are advised to -update their `docker-compose.yml` config based on our example: - - https://dl.photoprism.org/docker/armv7/docker-compose.yml - -You also have to revert to an alternative image if they want to use MariaDB, for example: - - https://hub.docker.com/r/linuxserver/mariadb - -The [official image](https://hub.docker.com/_/mariadb) is available for AMD64 and ARM64 only. -Pay close attention to changed directory and environment variable names. +servers apply otherwise: https://docs.photoprism.org/getting-started/docker-compose/ ### System Requirements ### @@ -50,5 +42,13 @@ Pay close attention to changed directory and environment variable names. `PHOTOPRISM_WORKERS` to a reasonably small value in `docker-compose.yml` (depending on the performance of the server). As a measure of last resort, you may disable using TensorFlow for image classification and facial recognition. -Big thank you to [Guy Sheffer](https://github.com/guysoft) -for [building](https://github.com/photoprism/photoprism/issues/109) this! +### Getting Updates ### + +If an old version is running on your device and doesn't update, you need to [explicitly pull](updates.md) +the latest image from [Docker Hub](https://hub.docker.com/r/photoprism/photoprism). Assuming that `:latest` +means new versions are automatically downloaded is a common mistake for users new to Docker. + +### Credits ### + +A big thank you to [Guy Sheffer](https://github.com/guysoft) for helping us [build](https://github.com/photoprism/photoprism/issues/109) +a Raspberry Pi version! diff --git a/docker/examples/armv7/docker-compose.yml b/docker/examples/armv7/docker-compose.yml index d35b091ee..1883ae707 100644 --- a/docker/examples/armv7/docker-compose.yml +++ b/docker/examples/armv7/docker-compose.yml @@ -110,7 +110,7 @@ services: ## see https://docs.photoprism.org/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql mariadb: restart: unless-stopped - image: lscr.io/linuxserver/mariadb:latest + image: linuxserver/mariadb:latest security_opt: - seccomp:unconfined - apparmor:unconfined