remove node docker stage, remove web ui

.dockerignore

@@ -1,10 +1,6 @@
 k6
 samples
 dist
-web/dist
-web/tmp
-web/node_modules
-web/bower_components
 js/node_modules
 .vagrant
 .git

.gitignore

@@ -1,11 +1,6 @@
 /k6
 /k6.exe
 /dist
-/web/bower_components
-/web/node_modules
-/web/dist/*
-!/web/dist/.gitkeep
-/web/tmp
 /js/node_modules
 /docs
 

Dockerfile

@@ -1,16 +1,11 @@
-FROM node:8.7-alpine
 FROM golang:1.9-alpine
 
-COPY --from=0 / /
 WORKDIR $GOPATH/src/github.com/loadimpact/k6
 ADD . .
 RUN apk --no-cache add --virtual .build-deps make git build-base && \
-	yarn global add ember-cli bower && \
-	make web && pwd && rm -r web/tmp web/node_modules web/bower_components && \
 	go get . && go install . && rm -rf $GOPATH/lib $GOPATH/pkg && \
 	(cd $GOPATH/src && ls | grep -v github | xargs rm -r) && \
 	(cd $GOPATH/src/github.com && ls | grep -v loadimpact | xargs rm -r) && \
 	apk del .build-deps
 
-ENV K6_ADDRESS 0.0.0.0:6565
 ENTRYPOINT ["k6"]

Makefile

@@ -1,26 +1,16 @@
-VERSION := 0.2.1
+VERSION := 0.2.2
 
-all: build web
+all: build
 
 .PHONY: build
-build: web
+build:
 	go build
 
 .PHONY: check
 check:
 	gometalinter --deadline 10m --config gometalinter.json ./...
 	go test -timeout 30s ./...
 
-.PHONY: web
-web: web/node_modules web/bower_components
-	cd web && node node_modules/.bin/ember build -prod
-
-web/node_modules:
-	cd web && npm install
-
-web/bower_components: web/node_modules
-	cd web && node node_modules/.bin/bower install --allow-root
-
 .PHONY: docs
 docs:
 	jsdoc -c jsdoc.json

README.md

@@ -115,18 +115,3 @@ Development Setup
 go get -u github.com/loadimpact/k6
 ```
 
-The only catch is, if you want the web UI available, it has to be built separately. Requires a working NodeJS installation.
-
-First, install the `ember-cli` and `bower` tools if you don't have them already:
-
-```bash
-npm install -g ember-cli bower
-```
-
-Then build the UI:
-
-```bash
-cd $GOPATH/src/github.com/loadimpact/k6/web
-npm install && bower install
-ember build
-```

api/server.go

@@ -24,21 +24,18 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/GeertJohan/go.rice"
 	"github.com/loadimpact/k6/api/common"
 	"github.com/loadimpact/k6/api/v1"
 	"github.com/loadimpact/k6/core"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/negroni"
 )
 
-var static = rice.MustFindBox("../web/dist")
-
 func NewHandler() http.Handler {
 	mux := http.NewServeMux()
 	mux.Handle("/v1/", v1.NewHandler())
 	mux.Handle("/ping", HandlePing())
-	mux.Handle("/", http.FileServer(static.HTTPBox()))
+	mux.Handle("/", HandlePing())
 	return mux
 }
 

build-release.sh

@@ -7,7 +7,6 @@ eval $(go env)
 VERSION=${1:-$(git describe --tags --abbrev=0)}
 
 # Fail early if external dependencies aren't installed.
-node --version > /dev/null || (echo "ERROR: node is not installed, bailing out."; exit 1)
 rice --help > /dev/null || (echo "ERROR: rice is not installed, run: go get github.com/GeertJohan/go.rice"; exit 1)
 
 make_archive() {
@@ -52,9 +51,6 @@ build_dist() {
 
 echo "--- Building Release: ${VERSION}"
 
-echo "-> Building web assets..."
-make web
-
 echo "-> Building platform packages..."
 mkdir -p dist