Merge pull request 'feat: upgrade-and-fix-postgres' (#2) from upgrade-and-fix-postgres into main

Reviewed-on: #2

doc/LiveUpgrade.md

@@ -11,6 +11,7 @@
 - 7.2.0: nextcloud 27 (manual publish)
 - 10.0.0: nextcloud 28.0.5
 - 10.1.0: nextcloud 29.0.0
+- 10.3.0: nextcloud 30
 
 ## Uprgrading process
 

infrastructure/nextcloud/image/Dockerfile

@@ -1,4 +1,4 @@
-FROM nextcloud:29
+FROM nextcloud:30
 
 # REQUIRES docker >= 2.10.10
 # https://docs.docker.com/engine/release-notes/20.10/#201010

project.clj

@@ -4,8 +4,8 @@
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "1.11.3"]
-                 [org.clojure/tools.reader "1.4.2"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.3.1"]
+                 [org.clojure/tools.reader "1.5.0"]
+                 [org.domaindrivenarchitecture/c4k-common-clj "9.0.1"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
@@ -23,9 +23,9 @@
                        :main dda.c4k-nextcloud.uberjar
                        :uberjar-name "c4k-nextcloud-standalone.jar"
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
-                                      [ch.qos.logback/logback-classic "1.5.6"
+                                      [ch.qos.logback/logback-classic "1.5.16"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.13"]
+                                      [org.slf4j/jcl-over-slf4j "2.0.16"]
                                       [com.github.clj-easy/graal-build-time "1.0.5"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]

src/main/cljc/dda/c4k_nextcloud/core.cljc

@@ -25,7 +25,8 @@
           #(not (nil? %))
           (cm/concat-vec
            (ns/generate resolved-config)
-           (postgres/generate (merge resolved-config {:postgres-size :8gb
+           (postgres/generate (merge resolved-config {:postgres-image "postgres:17"
+                                                      :postgres-size :8gb
                                                       :db-name "cloud"
                                                       :pv-storage-size-gb 50})
                               auth)