sendnrw/rdpgw
2
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2026-03-31 07:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move to more flexibility in image

Browse Source
This commit is contained in:
Bolke de Bruin
2024-03-18 13:36:41 +01:00
parent f75321f6b7
commit 91e382c586
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/rdpgw/config/configuration.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/knadh/koanf/providers/file" "github.com/knadh/koanf/providers/file"
"github.com/knadh/koanf/v2" "github.com/knadh/koanf/v2"
"log" "log"
"os"
"strings" "strings"
) )
@@ -152,8 +153,12 @@ func Load(configFile string) Configuration {
"Caps.TokenAuth": true, "Caps.TokenAuth": true,
}, "."), nil) }, "."), nil)
if err := k.Load(file.Provider(configFile), yaml.Parser()); err != nil { if _, err := os.Stat(configFile); os.IsNotExist(err) {
log.Fatalf("Error loading config from file: %v", err) log.Printf("Config file %s not found, using defaults and environment", configFile)
} else {
if err := k.Load(file.Provider(configFile), yaml.Parser()); err != nil {
log.Fatalf("Error loading config from file: %v", err)
}
} }
if err := k.Load(env.ProviderWithValue("RDPGW_", ".", func(s string, v string) (string, interface{}) { if err := k.Load(env.ProviderWithValue("RDPGW_", ".", func(s string, v string) (string, interface{}) {
@@ -161,7 +166,7 @@ func Load(configFile string) Configuration {
key = ToCamel(key) key = ToCamel(key)
return key, v return key, v
}), nil); err != nil { }), nil); err != nil {
log.Fatalf("Error loading config from file: %v", err) log.Fatalf("Error loading config from environment: %v", err)
} }
koanfTag := koanf.UnmarshalConf{Tag: "koanf"} koanfTag := koanf.UnmarshalConf{Tag: "koanf"}

2
dev/docker/Dockerfile
View File

@@ -41,7 +41,7 @@ COPY --chown=1001 run.sh run.sh
COPY --chown=1001 --from=builder /opt/rdpgw /opt/rdpgw COPY --chown=1001 --from=builder /opt/rdpgw /opt/rdpgw
COPY --chown=1001 --from=builder /etc/passwd /etc/passwd COPY --chown=1001 --from=builder /etc/passwd /etc/passwd
COPY --chown=1001 --from=builder /etc/ssl/certs /etc/ssl/certs COPY --chown=1001 --from=builder /etc/ssl/certs /etc/ssl/certs
COPY --chown=1001 rdpgw.yaml /opt/rdpgw/rdpgw.yaml #COPY --chown=1001 rdpgw.yaml /opt/rdpgw/rdpgw.yaml
WORKDIR /opt/rdpgw WORKDIR /opt/rdpgw
ENTRYPOINT ["/bin/sh", "/run.sh"] ENTRYPOINT ["/bin/sh", "/run.sh"]