Refactoring directory structure, to embed static thins into the docker container

Author: hyper-prog

Dockerfile

@@ -14,9 +14,14 @@ RUN GO111MODULE=auto CGO_ENABLED=0 GOOS=linux go build -a -o glowdash \
 FROM alpine AS glowdash
 LABEL maintainer="[email protected]" \
       description="GlowDash - Smart Home Web Dashboard"
+RUN mkdir /glowdash \
+    && mkdir /glowdash/static \
+    && mkdir /glowdash/user   \
+    && mkdir /glowdash/config
+COPY static/* /glowdash/static/
 COPY --from=glowdashbuildstage /glowdash/glowdash /usr/local/bin
 COPY --from=glowdashbuildstage /usr/share/zoneinfo /usr/share/zoneinfo
-RUN mkdir /glowdash
-VOLUME ["/glowdash"]
+VOLUME ["/glowdash/user"]
+VOLUME ["/glowdash/config"]
 WORKDIR /glowdash
-CMD ["/usr/local/bin/glowdash","/glowdash/config.yml"]
+CMD ["/usr/local/bin/glowdash","/glowdash/config/running.yml"]

README.md

@@ -50,21 +50,20 @@ Available amd64 and arm64 linux containers on Docker hub:
 Compile / Install
 -----------------
 It is recommended to use docker compose.
-If you do so, the config file is the "storage/config.yml" and your user images can be put into "storage/user"
+If you do so, the config file is the "config/running.yml" and your user images can be put into "userstuff"
 directory. After that, just edit the config file according to your needs and run the container
 
-    cat docs/config-samples/minimal.yml > storage/config.yml
+    cat config/minimal.yml > config/running.yml
     docker compose up -d
 
 
 If you still want to compile it yourself, add the dependencies and compile all the *.go files
 
     export GO111MODULE=auto
-    go install github.com/hyper-prog/smartjson
-    go install github.com/hyper-prog/smartyaml
+    go mod download
 
     go build -o glowdash glowdash/*.go
-    ./glowdash myconfig.yml
+    ./glowdash config/running.yml
 
 Other devices, Future
 ---------------------

config/README.md

@@ -0,0 +1,5 @@
+
+Here is the location of config files and the saved schedules
+The docker compose mount this folder.
+
+The "running.yml" is the config started by docker compose

docs/config-samples/big-sample-config.yml renamed to config/big-sample-config.yml

@@ -7,9 +7,9 @@ GlowDash:
     ApiKey: 1234sample5678
     Location: Budapest
   DebugLevel: 0               # 0 - silent, 1,2,3,4...
-  StaticDirectory: "static"   # Location of static glowdash files,js,css, images
-  UserDirectory: "user"       # Location of user images
-  StateConfigDirectory: "."   # Location where the scheduled tasks file is saved
+  StaticDirectory: "static"        # Location of static glowdash files,js,css, images
+  UserDirectory: "user"            # Location of user images
+  StateConfigDirectory: "config"   # Location where the scheduled tasks file is saved
   WebUseSSE: 1                # 0: disabled, 1: Make the browsers connect to SSE server
   WebSSEPort: 5018            # The port of SSE server listen on
   CommUseSSE: 1               # 0: disabled, 1: Enable the Glowdash notify SSE server

config/minimal.yml

@@ -0,0 +1,19 @@
+GlowDash:
+  DashboardTitle: "GlowDash"       #Show in main title line (You can change to your home name)
+  ReadWindInfo: false                #If true: reads some wind informations and show in title line
+  DebugLevel: 0                    # 0 - silent, 1,2,3,4...
+  StaticDirectory: "static"        # Location of static glowdash files,js,css, images 
+  UserDirectory: "user"            # Location of user images
+  StateConfigDirectory: "config"   # Location where the scheduled tasks file is saved
+  WebUseSSE: 0                     # 0: disabled, 1: Make the browsers connect to SSE server
+  CommUseSSE: 0                    # 0: disabled, 1: Enable the Glowdash notify SSE server
+  Panels:                          # You can define panels here
+    - Title: Shedule editor
+      PanelType: Launch
+      Thumbnail: schedules.png
+      LaunchTo: schedpage
+
+  Pages:
+    - Title: Scheduled tasks
+      PageType: ScheduleEdit
+      PageName: schedpage

docker-compose.yml

@@ -7,4 +7,5 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./storage:/glowdash
+      - ./userstuff:/glowdash/user
+      - ./config:/glowdash/config

docs/config-samples/minimal.yml

@@ -7,4 +7,5 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./storage:/glowdash
+      - ./userstuff:/glowdash/user
+      - ./config:/glowdash/config

docs/local-docker-compose-file/docker-compose.yml

@@ -0,0 +1,2 @@
+
+This filder contains user images