diff --git a/Dockerfile b/Dockerfile index c0bfc80..f959dcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,8 @@ FROM alpine:${V_ALPINE} AS final RUN apk --no-cache add tzdata ca-certificates dumb-init && \ rm -rf /tmp/* /var/tmp/* /usr/share/man /var/cache/apk/* -RUN addgroup -S appgroup && adduser -S appuser -G appgroup +RUN addgroup -g 1000 appgroup && \ + adduser -u 1000 -G appgroup -s /bin/bash -D appuser WORKDIR /app diff --git a/components/application.templ b/components/application.templ index 9a0efa6..fa920cc 100644 --- a/components/application.templ +++ b/components/application.templ @@ -4,7 +4,7 @@ import "gitlab.unjx.de/flohoss/godash/services" templ Application(application services.Application) { -
+
@templ.Raw(application.Icon)
{ application.Name }
diff --git a/services/bookmark.types.go b/services/bookmark.types.go index 7d4ad23..5cdebec 100644 --- a/services/bookmark.types.go +++ b/services/bookmark.types.go @@ -1,8 +1,7 @@ package services type BookmarkService struct { - bookmarks Bookmarks - SimpleIcons SimpleIcons + bookmarks Bookmarks } type Bookmarks struct { @@ -22,18 +21,8 @@ type Link struct { } type Application struct { - Name string - Icon string - IgnoreColor bool `yaml:"ignore_color"` - OverwriteColor string `yaml:"overwrite_color"` - URL string -} - -type SimpleIcons struct { - Icons []SimpleIcon `json:"icons"` -} - -type SimpleIcon struct { - Title string `json:"title"` - Hex string `json:"hex"` + Name string + Icon string + URL string + Light bool }