meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

Merge master #5

Merged
bom merged 2 commits from master into main 2024-02-16 09:04:52 +00:00
Conversation 0 Commits 2 Files changed 2 +6 -1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt
View file

@ -15,6 +15,7 @@ fun Prov.provisionPython(venvHome: String? = "~/.venv/meissa") = task {
installJupyterlab(venvHome) installJupyterlab(venvHome)
installLinters(venvHome) installLinters(venvHome)
installAsciinema(venvHome) installAsciinema(venvHome)
installPyTest(venvHome)
} }
fun Prov.installPython3(): ProvResult = task { fun Prov.installPython3(): ProvResult = task {
@ -50,6 +51,10 @@ fun Prov.installAsciinema(venvHome: String? = null): ProvResult = task {
pipInstall("asciinema", venvHome) pipInstall("asciinema", venvHome)
} }
fun Prov.installPyTest(venvHome: String? = null): ProvResult = task {
pipInstall("pytest", venvHome)
}
private fun Prov.pipInstall(pkg: String, venvHome: String? = null) { private fun Prov.pipInstall(pkg: String, venvHome: String? = null) {
cmd(activateVenvCommandPrefix(venvHome) + "pip3 install $pkg") cmd(activateVenvCommandPrefix(venvHome) + "pip3 install $pkg")
} }

2
src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt
View file

@ -10,7 +10,7 @@ import java.io.File
// ----------------------------------- versions -------------------------------- // ----------------------------------- versions --------------------------------
const val K3S_VERSION = "v1.27.4+k3s1" const val K3S_VERSION = "v1.29.1+k3s2"
// ----------------------------------- directories -------------------------------- // ----------------------------------- directories --------------------------------
const val k3sManualManifestsDir = "/etc/rancher/k3s/manifests/" const val k3sManualManifestsDir = "/etc/rancher/k3s/manifests/"