diff --git a/project.clj b/project.clj index f0f3aee..4c5f950 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.12.0" :scope "provided"] - [org.clojure/tools.reader "1.5.0"] - [org.domaindrivenarchitecture/c4k-common-clj "9.0.1"] + [org.clojure/tools.reader "1.5.2"] + [org.domaindrivenarchitecture/c4k-common-clj "10.0.0"] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]] :target-path "target/%s/" :source-paths ["src/main/cljc" @@ -24,9 +24,9 @@ :main dda.c4k-forgejo.uberjar :uberjar-name "c4k-forgejo-standalone.jar" :dependencies [[org.clojure/tools.cli "1.1.230"] - [ch.qos.logback/logback-classic "1.5.16" + [ch.qos.logback/logback-classic "1.5.18" :exclusions [com.sun.mail/javax.mail]] - [org.slf4j/jcl-over-slf4j "2.0.16"] + [org.slf4j/jcl-over-slf4j "2.0.17"] [com.github.clj-easy/graal-build-time "1.0.5"]]}} :release-tasks [["test"] ["vcs" "assert-committed"] diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 4e238fd..a241a34 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "9.0.1"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "10.0.0"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-forgejo.browser/init}} diff --git a/src/main/cljc/dda/c4k_forgejo/core.cljc b/src/main/cljc/dda/c4k_forgejo/core.cljc index a1688a6..4a87f8f 100644 --- a/src/main/cljc/dda/c4k_forgejo/core.cljc +++ b/src/main/cljc/dda/c4k_forgejo/core.cljc @@ -18,7 +18,7 @@ :federation-enabled "false" :db-name "forgejo" :pv-storage-size-gb 5 - :pvc-storage-class-name "" + :pvc-storage-class-name :local-path :postgres-image "postgres:14" :postgres-size :2gb :max-rate 10, @@ -56,7 +56,8 @@ (ns/generate resolved-config) [(postgres/generate-configmap resolved-config) (when (contains? resolved-config :postgres-data-volume-path) - (postgres/generate-persistent-volume (select-keys resolved-config [:postgres-data-volume-path :pv-storage-size-gb]))) + (postgres/generate-persistent-volume + (select-keys resolved-config [:postgres-data-volume-path :pv-storage-size-gb]))) (postgres/generate-pvc (merge resolved-config {:pvc-storage-class-name storage-class})) (postgres/generate-deployment resolved-config) (postgres/generate-service resolved-config) diff --git a/src/test/cljc/dda/c4k_forgejo/core_test.cljc b/src/test/cljc/dda/c4k_forgejo/core_test.cljc index df9720e..5beba93 100644 --- a/src/test/cljc/dda/c4k_forgejo/core_test.cljc +++ b/src/test/cljc/dda/c4k_forgejo/core_test.cljc @@ -20,7 +20,7 @@ (is (s/valid? cut/auth? (yaml/load-as-edn "forgejo-test/valid-auth.yaml")))) (deftest test-whole-generation - (is (= 32 + (is (= 35 (count (cut/config-objects (yaml/load-as-edn "forgejo-test/valid-config.yaml")))))