Skip to content

Commit 64e9d78

Browse files
committed
feat: env config and docker-specific config
fix: missing binaries in contanier image
1 parent 450f030 commit 64e9d78

4 files changed

Lines changed: 10 additions & 2 deletions

File tree

cmd/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ RUN --mount=type=cache,id=gsw_mod,target=/go/pkg/mod \
3131

3232
RUN --mount=type=cache,id=gsw_mod,target=/go/pkg/mod \
3333
--mount=type=cache,id=gsw_build,target=/root/.cache/go-build \
34-
for binary in grafana_live live_setup mem_view benchmark telem_view udp_command; do \
34+
for binary in grafana_live live_setup mem_view pipeline_benchmark telem_view udp_command; do \
3535
CGO_ENABLED=1 GOOS=linux go build \
3636
-trimpath \
3737
-o out/$binary \
3838
-v \
3939
# delve
4040
${USE_DELVE_DEBUG_FLAGS:+-gcflags "all=-N -l"} \
41-
./cmd/$binary/$binary.go; \
41+
./cmd/$binary/; \
4242
done
4343

4444
FROM alpine

cmd/gsw_service.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ func readConfig() (*viper.Viper, int) {
123123
flag.Parse()
124124
config.SetConfigName(*configFilepath)
125125
config.SetConfigType("yaml")
126+
config.SetEnvPrefix("GSW")
127+
config.AutomaticEnv()
126128
config.AddConfigPath("data/config/")
127129
err := config.ReadInConfig()
128130

compose.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ services:
1010
condition: service_started
1111
grafana:
1212
condition: service_started
13+
environment:
14+
- GSW_DATABASE_HOST_NAME=influxdb
15+
- GSW_LOGGER_OUTPUT_PATHS=stdout
1316
ports:
1417
- 11020:11020/udp
1518
- 13020:13020/udp

lib/logger/logger.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ func loadLoggerConfig() (*viper.Viper, error) {
6262
cfg.SetConfigType("yaml")
6363
cfg.SetConfigName("logger")
6464
cfg.AddConfigPath("data/config")
65+
cfg.SetEnvPrefix("GSW_LOGGER")
66+
cfg.AutomaticEnv()
67+
cfg.BindEnv("OutputPaths", "GSW_LOGGER_OUTPUT_PATHS")
6568
if err := cfg.ReadInConfig(); err != nil {
6669
return nil, err
6770
}

0 commit comments

Comments
 (0)