Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e66267d39 | |||
| 7a88b0c407 | |||
| ac786f6eab | |||
| d65f53d00f |
@@ -6,6 +6,7 @@ COPY *.go ./
|
|||||||
RUN CGO_ENABLED=0 GOOS=linux go build -o /goprg
|
RUN CGO_ENABLED=0 GOOS=linux go build -o /goprg
|
||||||
RUN mkdir /data
|
RUN mkdir /data
|
||||||
COPY services.json /data/services.json
|
COPY services.json /data/services.json
|
||||||
|
##COPY services.json /services.json
|
||||||
VOLUME ["/data"]
|
VOLUME ["/data"]
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
CMD ["/goprg"]
|
CMD ["/goprg"]
|
||||||
19
main.go
19
main.go
@@ -190,7 +190,7 @@ func envOr(k, def string) string {
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
addr := envOr("addr", ":8080")
|
addr := envOr("addr", ":8080")
|
||||||
cfgPath := envOr("config", ".\services.json")
|
cfgPath := envOr("config", "./services.json")
|
||||||
|
|
||||||
state := newState()
|
state := newState()
|
||||||
|
|
||||||
@@ -318,17 +318,12 @@ func writeJSON(w http.ResponseWriter, v any) {
|
|||||||
_ = enc.Encode(v)
|
_ = enc.Encode(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
func readConfig(path string) (*Config, error) {
|
func readConfig(p string) (*Config, error) {
|
||||||
var cfg Config
|
b, err := os.ReadFile(p)
|
||||||
f, err := http.Dir(".").Open(path) // schlichtes Lesen aus CWD
|
if err != nil { return nil, err }
|
||||||
if err != nil {
|
var cfg Config
|
||||||
return nil, err
|
if err := json.Unmarshal(b, &cfg); err != nil { return nil, err }
|
||||||
}
|
return &cfg, nil
|
||||||
defer f.Close()
|
|
||||||
if err := json.NewDecoder(f).Decode(&cfg); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &cfg, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var buildTime = time.Now()
|
var buildTime = time.Now()
|
||||||
|
|||||||
Reference in New Issue
Block a user