diff --git a/setup/docker/cloud/README.txt b/setup/docker/cloud/README.txt index bd93d4b57..83e992392 100644 --- a/setup/docker/cloud/README.txt +++ b/setup/docker/cloud/README.txt @@ -1,18 +1,20 @@ -PhotoPrism for Cloud Servers running Ubuntu 20.04 LTS (Focal Fossa) -=================================================================== +======================================================================== +PhotoPrism for Cloud Servers +Based on Ubuntu 22.04 LTS (Jammy Jellyfish) +======================================================================== SOFTWARE INCLUDED -------------------------------------------------------------------- +------------------------------------------------------------------------ PhotoPrism latest, AGPL 3 -Docker CE 20.10, Apache 2 -Traefik 2.4, MIT -MariaDB 10.5, GPL 2 -Ofelia 0.3.4, MIT -Watchtower 1.3, Apache 2 +Docker CE 23.0.1, Apache 2 +Traefik 2.9, MIT +MariaDB 10.10, GPL 2 +Ofelia 0.3.7, MIT +Watchtower 1.5.3, Apache 2 GETTING STARTED -------------------------------------------------------------------- +------------------------------------------------------------------------ Run this script as root to install PhotoPrism on a cloud server e.g. at DigitalOcean: @@ -52,7 +54,7 @@ Configuring multiple apps on the same server is beyond the scope of this base config and for advanced users only. SYSTEM REQUIREMENTS -------------------------------------------------------------------- +------------------------------------------------------------------------ We recommend hosting PhotoPrism on a server with at least 2 cores and 4 GB of memory. Beyond these minimum requirements, the amount of RAM @@ -63,7 +65,7 @@ RAW image conversion and automatic image classification using TensorFlow will be disabled on servers with 1 GB or less memory. USING LET'S ENCRYPT HTTPS -------------------------------------------------------------------- +------------------------------------------------------------------------ By default, a self-signed certificate will be used for HTTPS connections. Browsers are going to show a security warning because of that. Depending diff --git a/setup/docker/cloud/digitalocean/check.sh b/setup/docker/cloud/digitalocean/check.sh index 90c9cef77..b389ba1f6 100755 --- a/setup/docker/cloud/digitalocean/check.sh +++ b/setup/docker/cloud/digitalocean/check.sh @@ -579,7 +579,9 @@ osv=0 if [[ $OS == "Ubuntu" ]]; then ost=1 - if [[ $VER == "20.04" ]]; then + if [[ $VER == "22.04" ]]; then + osv=1 + elif [[ $VER == "20.04" ]]; then osv=1 elif [[ $VER == "18.04" ]]; then osv=1 diff --git a/setup/docker/cloud/docker-compose.yml b/setup/docker/cloud/docker-compose.yml index 410e75730..d262e0e48 100644 --- a/setup/docker/cloud/docker-compose.yml +++ b/setup/docker/cloud/docker-compose.yml @@ -1,7 +1,9 @@ version: '3.5' -# PhotoPrism for Cloud Servers running Ubuntu 20.04 LTS (Focal Fossa) -# =================================================================== +# ======================================================================== +# PhotoPrism for Cloud Servers +# Based on Ubuntu 22.04 LTS (Jammy Jellyfish) +# ======================================================================== # # Run this script as root to install PhotoPrism on a cloud server e.g. at DigitalOcean: # @@ -46,7 +48,7 @@ version: '3.5' # See jobs.ini for details. # # SYSTEM REQUIREMENTS -# -------------------------------------------------------------------------- +# ------------------------------------------------------------------------ # # We recommend hosting PhotoPrism on a server with at least 2 cores and # 4 GB of memory. Beyond these minimum requirements, the amount of RAM @@ -57,7 +59,7 @@ version: '3.5' # will be disabled on servers with 1 GB or less memory. # # DOCKER COMPOSE COMMAND REFERENCE -# -------------------------------------------------------------------------- +# ------------------------------------------------------------------------ # Start | docker compose up -d # Stop | docker compose stop # Update | docker compose pull @@ -78,7 +80,7 @@ version: '3.5' # More examples: https://docs.photoprism.app/getting-started/docker-compose/#command-line-interface # # USING LET'S ENCRYPT HTTPS -# -------------------------------------------------------------------------- +# ------------------------------------------------------------------------ # # If your server has a public domain name, please disable the self-signed # certificate and enable domain based routing in docker-compose.yml and