Compare commits
2 commits
c5b802543e
...
7a338774aa
Author | SHA1 | Date | |
---|---|---|---|
7a338774aa | |||
32284d90bd |
4 changed files with 29 additions and 28 deletions
|
@ -6,7 +6,7 @@ stages:
|
||||||
- image
|
- image
|
||||||
|
|
||||||
.img: &img
|
.img: &img
|
||||||
image: "domaindrivenarchitecture/ddadevops-dind:4.10.7"
|
image: "domaindrivenarchitecture/ddadevops-dind:4.11.3"
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
before_script:
|
before_script:
|
||||||
|
@ -16,7 +16,7 @@ stages:
|
||||||
- export IMAGE_TAG=$CI_COMMIT_TAG
|
- export IMAGE_TAG=$CI_COMMIT_TAG
|
||||||
|
|
||||||
.cljs-job: &cljs
|
.cljs-job: &cljs
|
||||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.7"
|
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.11.3"
|
||||||
cache:
|
cache:
|
||||||
key: ${CI_COMMIT_REF_SLUG}
|
key: ${CI_COMMIT_REF_SLUG}
|
||||||
paths:
|
paths:
|
||||||
|
@ -29,7 +29,7 @@ stages:
|
||||||
- npm install
|
- npm install
|
||||||
|
|
||||||
.clj-job: &clj
|
.clj-job: &clj
|
||||||
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.10.7"
|
image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.11.3"
|
||||||
cache:
|
cache:
|
||||||
key: ${CI_COMMIT_REF_SLUG}
|
key: ${CI_COMMIT_REF_SLUG}
|
||||||
paths:
|
paths:
|
||||||
|
@ -93,6 +93,15 @@ package-uberjar:
|
||||||
paths:
|
paths:
|
||||||
- target/uberjar
|
- target/uberjar
|
||||||
|
|
||||||
|
package-native:
|
||||||
|
<<: *clj
|
||||||
|
stage: package
|
||||||
|
script:
|
||||||
|
- pyb package_native
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- target/graalvm
|
||||||
|
|
||||||
release-to-clojars:
|
release-to-clojars:
|
||||||
<<: *clj
|
<<: *clj
|
||||||
<<: *tag_only
|
<<: *tag_only
|
||||||
|
@ -113,11 +122,3 @@ jitsi-web-image-publish:
|
||||||
stage: image
|
stage: image
|
||||||
script:
|
script:
|
||||||
- cd infrastructure/web && pyb image publish
|
- cd infrastructure/web && pyb image publish
|
||||||
|
|
||||||
jitsi-excalidraw-backend-image-publish:
|
|
||||||
<<: *img
|
|
||||||
<<: *tag_only
|
|
||||||
stage: image
|
|
||||||
script:
|
|
||||||
- cd infrastructure/excalidraw-backend && pyb image publish
|
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
:url "https://www.apache.org/licenses/LICENSE-2.0.html"}
|
:url "https://www.apache.org/licenses/LICENSE-2.0.html"}
|
||||||
:dependencies [[org.clojure/clojure "1.11.3"]
|
:dependencies [[org.clojure/clojure "1.11.3"]
|
||||||
[org.clojure/tools.reader "1.4.2"]
|
[org.clojure/tools.reader "1.4.2"]
|
||||||
[org.domaindrivenarchitecture/c4k-common-clj "6.2.3"]
|
[org.domaindrivenarchitecture/c4k-common-clj "6.3.1"]
|
||||||
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
||||||
:target-path "target/%s/"
|
:target-path "target/%s/"
|
||||||
:source-paths ["src/main/cljc"
|
:source-paths ["src/main/cljc"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"src/test/cljc"
|
"src/test/cljc"
|
||||||
"src/test/cljs"
|
"src/test/cljs"
|
||||||
"src/test/resources"]
|
"src/test/resources"]
|
||||||
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.1.0"]
|
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.3.1"]
|
||||||
[hickory "0.7.1"]]
|
[hickory "0.7.1"]]
|
||||||
:builds {:frontend {:target :browser
|
:builds {:frontend {:target :browser
|
||||||
:modules {:main {:init-fn dda.c4k-jitsi.browser/init}}
|
:modules {:main {:init-fn dda.c4k-jitsi.browser/init}}
|
||||||
|
|
|
@ -19,21 +19,21 @@
|
||||||
(def config? (s/keys :req-un [::fqdn]
|
(def config? (s/keys :req-un [::fqdn]
|
||||||
:opt-un [::issuer]))
|
:opt-un [::issuer]))
|
||||||
|
|
||||||
(def auth? (s/keys :req-un [::jvb-auth-password
|
(def auth? (s/keys :req-un [::jvb-auth-password
|
||||||
::jicofo-auth-password
|
::jicofo-auth-password
|
||||||
::jicofo-component-secret]))
|
::jicofo-component-secret]))
|
||||||
#?(:cljs
|
#?(:cljs
|
||||||
(defmethod yaml/load-resource :jitsi [resource-name]
|
(defmethod yaml/load-resource :jitsi [resource-name]
|
||||||
(get (inline-resources "jitsi") resource-name)))
|
(get (inline-resources "jitsi") resource-name)))
|
||||||
|
|
||||||
(defn-spec generate-ingress-web cp/map-or-seq?
|
(defn-spec generate-ingress-web cp/map-or-seq?
|
||||||
[config config?]
|
[config config?]
|
||||||
(ing/generate-ingress-and-cert
|
(ing/generate-ingress-and-cert
|
||||||
(merge
|
(merge
|
||||||
{:service-name "web"
|
{:service-name "web"
|
||||||
:service-port 80
|
:service-port 80
|
||||||
:fqdns [(:fqdn config)]}
|
:fqdns [(:fqdn config)]}
|
||||||
config)))
|
config)))
|
||||||
|
|
||||||
(defn-spec generate-ingress-etherpad cp/map-or-seq?
|
(defn-spec generate-ingress-etherpad cp/map-or-seq?
|
||||||
[config config?]
|
[config config?]
|
||||||
|
@ -79,11 +79,11 @@
|
||||||
(let [{:keys [fqdn]} config]
|
(let [{:keys [fqdn]} config]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "jitsi/deployment.yaml")
|
(yaml/load-as-edn "jitsi/deployment.yaml")
|
||||||
(cm/replace-all-matching-values-by-new-value "REPLACE_JITSI_FQDN" fqdn)
|
(cm/replace-all-matching "REPLACE_JITSI_FQDN" fqdn)
|
||||||
(cm/replace-all-matching-values-by-new-value "REPLACE_ETHERPAD_URL"
|
(cm/replace-all-matching "REPLACE_ETHERPAD_URL"
|
||||||
(str "https://etherpad." fqdn "/p/"))
|
(str "https://etherpad." fqdn "/p/"))
|
||||||
(cm/replace-all-matching-values-by-new-value "REPLACE_EXCALIDRAW_BACKEND_URL"
|
(cm/replace-all-matching "REPLACE_EXCALIDRAW_BACKEND_URL"
|
||||||
(str "https://excalidraw-backend." fqdn)))))
|
(str "https://excalidraw-backend." fqdn)))))
|
||||||
|
|
||||||
(defn-spec generate-excalidraw-deployment cp/map-or-seq? []
|
(defn-spec generate-excalidraw-deployment cp/map-or-seq? []
|
||||||
(yaml/load-as-edn "jitsi/excalidraw-deployment.yaml"))
|
(yaml/load-as-edn "jitsi/excalidraw-deployment.yaml"))
|
||||||
|
|
Loading…
Reference in a new issue