direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: direktil:f83b1eab2352cd4df2f19def07b8e3e04a0c3871
Branches Tags
direktil:main direktil:dev direktil:testing direktil:test
...
compare: direktil:dev
Branches Tags
direktil:main direktil:dev direktil:testing direktil:test

2 Commits
f83b1eab23 ... dev

Author SHA1 Message Date
Mikaël Cluseau
98eb601fd3 hack/docker-build: add GIT_TAG 2025-08-08 10:46:34 +02:00
Mikaël Cluseau
8e87d406e4 log oops 2025-07-28 08:48:10 +02:00
2 changed files with 7 additions and 5 deletions
Expand all files Collapse all files

5
cmd/dkl-local-server/ws-hosts-from-templates.go
View File

@ -28,7 +28,6 @@ func (hft HostFromTemplate) ClusterName(cfg *localconfig.Config) string {
func hostOrTemplate(cfg *localconfig.Config, name string) (host *localconfig.Host) { func hostOrTemplate(cfg *localconfig.Config, name string) (host *localconfig.Host) {
host = cfg.Host(name) host = cfg.Host(name)
if host != nil { if host != nil {
log.Print("no host named ", name)
return return
} }
@ -39,13 +38,13 @@ func hostOrTemplate(cfg *localconfig.Config, name string) (host *localconfig.Hos
} }
if !found { if !found {
log.Print("no host from template named ", name) log.Print("no host named ", name)
return return
} }
ht := cfg.HostTemplate(hft.Template) ht := cfg.HostTemplate(hft.Template)
if ht == nil { if ht == nil {
log.Print("no host template named ", name) log.Print("host ", name, " found but no template named ", hft.Template)
return return
} }

7
hack/docker-build
View File

@ -1,8 +1,11 @@
#! /bin/bash #! /bin/bash
set -ex set -ex
GIT_TAG=$(git describe --always --dirty)
case "$1" in case "$1" in
commit) tag=$(git describe --always --dirty) ;; commit) tag=$GIT_TAG ;;
"") tag=latest ;; "") tag=latest ;;
*) tag=$1 ;; *) tag=$1 ;;
esac esac
docker build -t novit.tech/direktil/local-server:$tag . docker build -t novit.tech/direktil/local-server:$tag . --build-arg GIT_TAG=$GIT_TAG