Dockerize development environment.

README.md

@@ -21,7 +21,7 @@ Run the following commands
     go run cmd/go-graphkb/main.go start
 
     # In another terminal start the web server with the following
-    # command to acces the web UI at http://127.0.0.1:8090
+    # command to acces the web UI at http://127.0.0.1:3000
     go run cmd/go-graphkb/main.go listen
 
 

bootstrap.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -z "$OLD_PS1" ]; then
+  OLD_PS1="$PS1"
+  export PS1="(graphkb) $PS1"
+fi
+
+if [ $(id -u) = 0 ]; then
+  echo "Cannot run as root, defaulting to UID 1000"
+  export USER_ID=1000
+else
+  export USER_ID=$(id -u)
+fi
+
+if [ $(id -g) = 0 ]; then
+  echo "Cannot run as root, defaulting to GID 1000"
+  export GROUP_ID=1000
+else
+  export GROUP_ID=$(id -g)
+fi
+

cmd/go-graphkb/config.yml

@@ -1,11 +1,11 @@
-port: 8090
-tls_key: keys/server.key
-tls_cert: keys/server.crt
+port: 8080
+# tls_key: cmd/go-graphkb/keys/server.key
+# tls_cert: cmd/go-graphkb/keys/server.crt
 
 mariadb:
   username: graphkb
   password: password
-  host:
+  host: db
   database: graphkb
 
 sources:

cmd/importer-csv/config.yml

@@ -1,5 +1,5 @@
 graphkb:
-  url: "https://localhost:8090"
+  url: "http://localhost:8080"
   auth_token: "token_auth_for_csv_importer"
   skip_verify: true
 

docker-compose.yml

@@ -13,11 +13,40 @@ services:
       MYSQL_DATABASE: graphkb
       MYSQL_USER: graphkb
       MYSQL_PASSWORD: password
-    volumes:
-      - /var/lib/go-graphkb:/var/lib/mysql
+    ## Uncomment to persist database on host disk
+    # volumes:
+    #   - /var/lib/go-graphkb:/var/lib/mysql
 
   adminer:
     image: adminer
     restart: always
+    ports:
+      - 8090:8080
+
+  frontend:
+    build:
+      context: docker
+      dockerfile: Dockerfile.frontend
+      args:
+        USER_ID: ${USER_ID}
+        GROUP_ID: ${GROUP_ID}
+    command: "sh -c 'npm ci && npm run start'"
+    working_dir: "/app"
+    volumes:
+      - ./web:/app
+    ports:
+      - 3000:3000
+
+  graphkb:
+    build:
+      context: docker
+      dockerfile: Dockerfile.graphkb
+      args:
+        USER_ID: ${USER_ID}
+        GROUP_ID: ${GROUP_ID}
+    entrypoint: "./scripts/graphkb-entrypoint.sh"
+    working_dir: "/app"
+    volumes:
+      - .:/app
     ports:
       - 8080:8080

docker/Dockerfile.frontend

@@ -0,0 +1,9 @@
+FROM node:12-alpine
+
+ARG USER_ID
+ARG GROUP_ID
+
+RUN deluser node && \
+    addgroup --gid ${GROUP_ID} dev && \
+    adduser --uid ${USER_ID} -G dev -D dev
+USER dev

docker/Dockerfile.graphkb

@@ -0,0 +1,9 @@
+FROM golang:1.13-alpine
+
+ARG USER_ID
+ARG GROUP_ID
+
+RUN addgroup --gid ${GROUP_ID} dev && \
+    adduser --uid ${USER_ID} -G dev -D dev
+
+USER dev

go.mod

@@ -5,12 +5,16 @@ go 1.13
 require (
 	github.com/abbot/go-http-auth v0.4.0
 	github.com/antlr/antlr4 v0.0.0-20200103163232-691acdc23f1f
+	github.com/cespare/reflex v0.2.0 // indirect
 	github.com/cheggaaa/pb v2.0.7+incompatible
 	github.com/deckarep/golang-set v1.7.1
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
 	github.com/gorilla/mux v1.7.3
-	github.com/hashicorp/consul/api v1.3.0
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/mattn/go-colorable v0.0.9 // indirect
+	github.com/mattn/go-isatty v0.0.3 // indirect
+	github.com/ogier/pflag v0.0.1 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.6.1
 	github.com/stretchr/testify v1.3.0

internal/server/server.go

@@ -364,8 +364,15 @@ func StartServer(database knowledge.GraphDB, schemaPersistor schema.Persistor,
 	bindInterface := fmt.Sprintf(":%d", viper.GetInt32("port"))
 	fmt.Printf("Listening on %s\n", bindInterface)
 
-	err := http.ListenAndServeTLS(bindInterface, viper.GetString("tls_cert"),
-		viper.GetString("tls_key"), r)
+	var err error
+	if viper.GetString("tls_cert") != "" {
+		fmt.Println("Server is using TLS, the connection is secure")
+		err = http.ListenAndServeTLS(bindInterface, viper.GetString("tls_cert"),
+			viper.GetString("tls_key"), r)
+	} else {
+		fmt.Println("[WARNING] Server is NOT using TLS, the connection is not secure")
+		err = http.ListenAndServe(bindInterface, r)
+	}
 	if err != nil {
 		log.Fatal(err)
 	}

scripts/graphkb-entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+go get github.com/cespare/reflex
+
+reflex -r '\.go|\.yml' -s -- sh -c "go run cmd/go-graphkb/main.go --config cmd/go-graphkb/config.yml listen"

web/package.json

@@ -51,5 +51,5 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://localhost:8090"
-}
+  "proxy": "http://graphkb:8080"
+}