build: Improve docker setup

Author: g3force

.dockerignore

@@ -0,0 +1,3 @@
+/node_modules
+/dist
+/.git

.gitignore

@@ -21,4 +21,4 @@ yarn-error.log*
 *.sw?
 
 # application specific
-board-config.yaml
+/config

Dockerfile

@@ -17,5 +17,6 @@ RUN GOOS=linux GOARCH=amd64 packr build -o ../../release/ssl-status-board_linux_
 FROM alpine:3.9
 COPY --from=build_go /go/src/github.com/RoboCup-SSL/ssl-status-board/release/ssl-status-board_linux_amd64 /app/ssl-status-board
 EXPOSE 8082
+WORKDIR "/"
 ENTRYPOINT ["/app/ssl-status-board"]
-CMD ["/app/ssl-status-board", "-address", ":8082"]
+CMD ["/app/ssl-status-board"]

README.md

@@ -12,6 +12,18 @@ A Status Board for the Small Size League, optimized to show the current game sta
 If you just want to use this app, simply download the latest [release binary](https://github.com/RoboCup-SSL/ssl-status-board/releases/latest).
 The binary is self-contained. No dependencies are required.
 
+You can also use pre-build docker images:
+```shell script
+docker pull robocupssl/ssl-status-board
+docker run -p 8082:8082 robocupssl/ssl-status-board
+# if you want to pass in the config file:
+docker run -p 8082:8082 -v "$(pwd)/config:/config" ssl-status-board
+```
+
+By default, the UI is available at http://localhost:8082
+
+A configuration file will be generated to `config/board-config.yaml` and can be tweaked.
+
 ### Runtime Requirements
  * No software dependencies (except for development, see below)
  * 64bit Linux, Windows, OSX (build your 32bit binaries yourself...)

cmd/ssl-status-board/main.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 )
 
-var address = flag.String("address", "localhost:8082", "The address on which the UI and API is served")
-var configFile = flag.String("c", "board-config.yaml", "The config file to use")
+var address = flag.String("address", ":8082", "The address on which the UI and API is served")
+var configFile = flag.String("c", "config/board-config.yaml", "The config file to use")
 
 func main() {
 	flag.Parse()

docker-compose.yaml

@@ -0,0 +1,9 @@
+version: '2'
+
+services:
+  ssl-status-board:
+    build: .
+    ports:
+      - "8082:8082"
+    volumes:
+      - "./config:/config"

go.mod

@@ -3,8 +3,18 @@ module github.com/RoboCup-SSL/ssl-status-board
 go 1.14
 
 require (
+	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gobuffalo/packr v1.30.1
+	github.com/gobuffalo/packr/v2 v2.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2
+	github.com/karrick/godirwalk v1.15.6 // indirect
 	github.com/pkg/errors v0.9.1
+	github.com/rogpeppe/go-internal v1.6.0 // indirect
+	github.com/sirupsen/logrus v1.6.0 // indirect
+	github.com/spf13/cobra v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
+	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
 	gopkg.in/yaml.v2 v2.2.8
 )

go.sum

@@ -65,7 +65,7 @@ func (c *Config) WriteTo(fileName string) (err error) {
 	}
 	err = os.MkdirAll(filepath.Dir(fileName), 0755)
 	if err != nil {
-		err = errors.Wrapf(err, "Could not create directly for config file: %v", fileName)
+		err = errors.Wrapf(err, "Could not create directory for config file: %v", fileName)
 		return
 	}
 	err = ioutil.WriteFile(fileName, b, 0600)

pkg/board/serverConfig.go

@@ -59,10 +59,16 @@ if (process.env.NODE_ENV === 'development') {
     wsAddress = 'ws://localhost:8082/api/referee';
 } else {
     // UI and backend are served on the same host+port on production builds
-    wsAddress = 'ws://' + window.location.hostname + ':' + window.location.port + '/api/referee';
+    let protocol;
+    if (window.location.protocol === 'http:') {
+        protocol = 'ws:'
+    } else {
+        protocol = 'wss:'
+    }
+    wsAddress = protocol + '//' + window.location.hostname + ':' + window.location.port + '/api/referee';
 }
 
-var ws = new WebSocket(wsAddress);
+const ws = new WebSocket(wsAddress);
 ws.binaryType = "arraybuffer";
 
 // Connect to the backend with a single websocket that communicates with JSON format and is attached to the store