Merge branch 'master' into rob/#89-env-options

.gometalinter.json

@@ -9,6 +9,6 @@
         "vet"
     ],
     "Exclude": [
-        "client/bootstrap.go"
+        "client/internal/compiled.go"
     ]
 }

Dockerfile

@@ -31,12 +31,13 @@ RUN go build -o /bin/inertiad \
 
 ### Part 3 - Copy builds into combined image
 FROM alpine
-LABEL maintainer "UBC Launchpad team@ubclaunchpad.com"
-WORKDIR /app
+LABEL maintainer "UBC Launch Pad team@ubclaunchpad.com"
+RUN mkdir -p /daemon
+WORKDIR /daemon
 COPY --from=daemon-build-env /bin/inertiad /usr/local/bin
 COPY --from=web-build-env \
     /go/src/github.com/ubclaunchpad/inertia/daemon/web/public/ \
-    /app/inertia-web
+    /daemon/inertia-web
 
 # Serve the daemon by default.
 ENTRYPOINT ["inertiad", "run"]

Makefile

@@ -128,7 +128,7 @@ daemon:
 # modified.
 .PHONY: bootstrap
 bootstrap:
-	go-bindata -o client/bootstrap.go -pkg client client/bootstrap/...
+	go-bindata -o client/internal/compiled.go -pkg client client/scripts/...
 
 # Install Inertia Web dependencies. Use PACKAGE to install something.
 .PHONY: web-deps

client/client.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/gorilla/websocket"
+	internal "github.com/ubclaunchpad/inertia/client/internal"
 	"github.com/ubclaunchpad/inertia/common"
 )
 
@@ -108,7 +109,7 @@ key to enable continuous deployment.`)
 
 // DaemonUp brings the daemon up on the remote instance.
 func (c *Client) DaemonUp(daemonVersion, host, daemonPort string) error {
-	scriptBytes, err := Asset("client/bootstrap/daemon-up.sh")
+	scriptBytes, err := internal.Asset("client/scripts/daemon-up.sh")
 	if err != nil {
 		return err
 	}
@@ -120,7 +121,7 @@ func (c *Client) DaemonUp(daemonVersion, host, daemonPort string) error {
 
 // DaemonDown brings the daemon down on the remote instance
 func (c *Client) DaemonDown() error {
-	scriptBytes, err := Asset("client/bootstrap/daemon-down.sh")
+	scriptBytes, err := internal.Asset("client/scripts/daemon-down.sh")
 	if err != nil {
 		return err
 	}

client/client_test.go

@@ -112,18 +112,19 @@ func TestGetNewClient(t *testing.T) {
 func TestInstallDocker(t *testing.T) {
 	session := &mockSSHRunner{}
 	client := getIntegrationClient(session)
-	script, err := ioutil.ReadFile("bootstrap/docker.sh")
+	script, err := ioutil.ReadFile("scripts/docker.sh")
 	assert.Nil(t, err)
 
 	// Make sure the right command is run.
-	client.installDocker(session)
+	err = client.installDocker(session)
+	assert.Nil(t, err)
 	assert.Equal(t, string(script), session.Calls[0])
 }
 
 func TestDaemonUp(t *testing.T) {
 	session := &mockSSHRunner{}
 	client := getIntegrationClient(session)
-	script, err := ioutil.ReadFile("bootstrap/daemon-up.sh")
+	script, err := ioutil.ReadFile("scripts/daemon-up.sh")
 	assert.Nil(t, err)
 	actualCommand := fmt.Sprintf(string(script), "latest", "4303", "0.0.0.0")
 
@@ -137,12 +138,10 @@ func TestDaemonUp(t *testing.T) {
 func TestKeyGen(t *testing.T) {
 	session := &mockSSHRunner{}
 	remote := getIntegrationClient(session)
-	script, err := ioutil.ReadFile("bootstrap/token.sh")
+	script, err := ioutil.ReadFile("scripts/token.sh")
 	assert.Nil(t, err)
 	tokenScript := fmt.Sprintf(string(script), "test")
 
-	// Make sure the right command is run.
-
 	// Make sure the right command is run.
 	_, err = remote.getDaemonAPIToken(session, "test")
 	assert.Nil(t, err)
@@ -153,17 +152,17 @@ func TestBootstrap(t *testing.T) {
 	session := &mockSSHRunner{}
 	client := getIntegrationClient(session)
 
-	dockerScript, err := ioutil.ReadFile("bootstrap/docker.sh")
+	dockerScript, err := ioutil.ReadFile("scripts/docker.sh")
 	assert.Nil(t, err)
 
-	keyScript, err := ioutil.ReadFile("bootstrap/keygen.sh")
+	keyScript, err := ioutil.ReadFile("scripts/keygen.sh")
 	assert.Nil(t, err)
 
-	script, err := ioutil.ReadFile("bootstrap/token.sh")
+	script, err := ioutil.ReadFile("scripts/token.sh")
 	assert.Nil(t, err)
 	tokenScript := fmt.Sprintf(string(script), "test")
 
-	script, err = ioutil.ReadFile("bootstrap/daemon-up.sh")
+	script, err = ioutil.ReadFile("scripts/daemon-up.sh")
 	assert.Nil(t, err)
 	daemonScript := fmt.Sprintf(string(script), "test", "4303", "127.0.0.1")