Skip to content

Commit da32a02

Browse files
authored
Merge pull request #770 from damongolding/task/release
0.39.1
2 parents 7ae81dd + e8d9e80 commit da32a02

5 files changed

Lines changed: 16 additions & 5 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN npm ci
99
RUN task frontend
1010

1111
# Go Builder
12-
FROM --platform=$BUILDPLATFORM golang:1.26.3-bookworm AS build
12+
FROM --platform=$BUILDPLATFORM golang:1.26.4-bookworm AS build
1313

1414
ARG VERSION=demo
1515
ARG TARGETOS

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/damongolding/immich-kiosk
22

3-
go 1.26.3
3+
go 1.26.4
44

55
require (
66
charm.land/lipgloss/v2 v2.0.3

internal/config/config.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"encoding/json"
2525
"errors"
2626
"fmt"
27+
"io/fs"
2728
"net/url"
2829
"os"
2930
"reflect"
@@ -611,8 +612,18 @@ func (c *Config) Load() error {
611612
switch {
612613
case errors.As(readInConfigErr, &configFileNotFoundErr):
613614
log.Info("Not using config.yaml")
615+
616+
case errors.Is(readInConfigErr, fs.ErrPermission):
617+
fileInfo, err := os.Stat(c.V.ConfigFileUsed())
618+
if err != nil {
619+
return fmt.Errorf("getting config file info: %w", err)
620+
}
621+
622+
mode := fmt.Sprintf("%o", fileInfo.Mode().Perm())
623+
return fmt.Errorf("config file permission is %s, it should be %o: %w", mode, os.FileMode(0o644), readInConfigErr)
624+
614625
case isValidYAML(c.V.ConfigFileUsed()) != nil:
615-
log.Fatal(readInConfigErr)
626+
return fmt.Errorf("invalid YAML: %w", readInConfigErr)
616627
}
617628
} else {
618629
level := strings.ToLower(strings.TrimSpace(c.V.GetString("kiosk.config_validation_level")))

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func main() {
9898

9999
configErr := baseConfig.Load()
100100
if configErr != nil {
101-
log.Error("Failed to load config", "err", configErr)
101+
log.Fatal("Failed to load config", "err", configErr)
102102
}
103103

104104
if baseConfig.Kiosk.DemoMode {

taskfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22

33
env:
4-
VERSION: 0.39.0-beta.6
4+
VERSION: 0.39.1-beta.1
55

66
silent: true
77

0 commit comments

Comments
 (0)