From 711ceecefc1b600b9366d2d8839f38344965a570 Mon Sep 17 00:00:00 2001 From: Michael Jerger <michael.jerger@meissa-gmbh.de> Date: Thu, 9 Jan 2025 09:24:46 +0100 Subject: [PATCH 1/4] upgrade versions --- project.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 9798606..00d5a9b 100644 --- a/project.clj +++ b/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.0-SNAPSHOT"] [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"] From 394959d158e1508d009e1acfb8406f92a2181a5f Mon Sep 17 00:00:00 2001 From: Michael Jerger <michael.jerger@meissa-gmbh.de> Date: Thu, 9 Jan 2025 12:54:27 +0100 Subject: [PATCH 2/4] update db --- src/main/cljc/dda/c4k_nextcloud/core.cljc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/cljc/dda/c4k_nextcloud/core.cljc b/src/main/cljc/dda/c4k_nextcloud/core.cljc index 9d7cfdb..5fcab59 100644 --- a/src/main/cljc/dda/c4k_nextcloud/core.cljc +++ b/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) From 741b7206320752fcf5636212e9a58f27bfc9a6b9 Mon Sep 17 00:00:00 2001 From: Michael Jerger <michael.jerger@meissa-gmbh.de> Date: Thu, 9 Jan 2025 12:55:40 +0100 Subject: [PATCH 3/4] upgrade versions --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 00d5a9b..6f90bea 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.3"] [org.clojure/tools.reader "1.5.0"] - [org.domaindrivenarchitecture/c4k-common-clj "9.0.0-SNAPSHOT"] + [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" From 20c66235c0443b4aaa6ba31f76688741b0ea6299 Mon Sep 17 00:00:00 2001 From: Michael Jerger <michael.jerger@meissa-gmbh.de> Date: Thu, 9 Jan 2025 12:55:51 +0100 Subject: [PATCH 4/4] upgrade nextcloud --- doc/LiveUpgrade.md | 1 + infrastructure/nextcloud/image/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/LiveUpgrade.md b/doc/LiveUpgrade.md index b6cb87b..647cb23 100644 --- a/doc/LiveUpgrade.md +++ b/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 diff --git a/infrastructure/nextcloud/image/Dockerfile b/infrastructure/nextcloud/image/Dockerfile index 39954be..41e4dfa 100644 --- a/infrastructure/nextcloud/image/Dockerfile +++ b/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