Add makefile and include changes for using dep golang dependency manager.

Author: Jean-Marcel Belmont

.gitignore

@@ -42,3 +42,6 @@ key.pem
 
 # Mongo data
 /mongo_data
+
+# Go dependencies
+/vendor

.travis.yml

@@ -3,19 +3,20 @@ sudo: required
 language: go
 go:
   - 1.8.x
+
 before_install:
-  - go get github.com/mattn/goveralls
-  - go get github.com/stretchr/testify/assert
-  - go get github.com/gorilla/mux
-  - go get github.com/jbelmont/docker-workshop/handlers
-  - go get github.com/jbelmont/docker-workshop/model
-  - go get github.com/jbelmont/docker-workshop/redis
-  - go get github.com/jbelmont/docker-workshop/routes
+  - make travis-before-build-step
+
+install:
+  - make travis-build-step
+
 before_script:
   - git config --global user.email "[email protected]"
   - git config --global user.name "jbelmont"
+
 script:
-  - go test ./...
+  - make travis-script-step
+
 env:
   global:
     secure: XR1gtkk5R+7UbgMs6pUxUkB4+RP67SR/3Q63CDf6wTv8gyxccTZ5ESXF6ii8k7iMPu8sPolN6EXTdVRV3kHN02CDr1kso00crPpn9eYFSUwEsTO5deh2/PK+po7rOKo+5QTjG1KPgeaQbkW/pdvE66PtHxH94WJ/6Ed2/yU2Atd3iKx8UInxgmOFpW1HeyrC55XBbxTcyQv+hMPqNKcrxZWJW4UU/qU88Pw5q9wEw0X8zrAF6O1asErgadsmhzBoD6dmlbNf1KFIrqujiIP21NEt+5DhtM4MV3iyNm3c9z4YnKWRzV6padrrW8enHVoKzQcbR9uzgHxoaAlsM6faaMmvrrjTcohDQK8fPtHxFTdN4W8JASJViEr/PUjZJvvcVAfKgRMgJY8FXL5aX68Le5WBK4PtMTWl7+0RdKtI66syc69q7pGJ79tbQa4ufv/CgBiI2WZPNftU5e+lFqlVfq8G3FZHkh0QRBL+FEU09x3ZKePxBh4oGLi3CCLcYu+nMwIL1R4IibNzm6xnxuXl/HwcJ5VGDQ1PC67E36jFeE+QGxjbQL1sRMaw+QgIYqijKapLz5/R7FvR0FG32v182XqV0dK/Wtze3/FxAsmi0n28FcdB9QqoEpOWNPCHaPeSPu49vVUIVzuZUP9G8Infjh3KrW1mRmcIKecHmDLOde0=

Dockerfile

@@ -16,6 +16,7 @@ COPY package.json ${appDir}/package.json
 
 # Install npm dependencies and install ava globally
 RUN npm install
+RUN npm install -g ava
 RUN npm rebuild node-sass
 
 # Add main node execution command

Dockerfile-go

@@ -3,20 +3,14 @@ FROM golang:1.8.3
 LABEL maintainer "[email protected]"
 
 # Set Environment variables
-ENV appDir /var/www/app
+ENV appDir /go/src/github.com/jbelmont/containerized-golang-and-vuejs
 
 # Set the work directory
 RUN mkdir -p ${appDir}
 WORKDIR ${appDir}
 ADD . ${appDir}
 
-RUN go get gopkg.in/mgo.v2
-RUN go get github.com/garyburd/redigo/redis
-RUN go get github.com/gorilla/mux
-RUN go get github.com/gorilla/handlers
-RUN go get github.com/jbelmont/containerized-golang-and-vuejs/routes
-RUN go get github.com/jbelmont/containerized-golang-and-vuejs/handlers
-RUN go get github.com/jbelmont/containerized-golang-and-vuejs/model
-RUN go get github.com/jbelmont/containerized-golang-and-vuejs/redis
+RUN go get -u github.com/golang/dep/cmd/dep && \
+    dep ensure
 
 RUN go build

Gopkg.lock

@@ -0,0 +1,41 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/garyburd/redigo"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.6.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.0"
+
+[[constraint]]
+  branch = "v2"
+  name = "gopkg.in/mgo.v2"
+
+[[constraint]]
+  name = "github.com/mattn/goveralls"
+  version = "0.0.1"

Gopkg.toml

@@ -0,0 +1,32 @@
+BIN_DIR := "bin/trilug"
+
+all: ensure package
+
+.PHONY: generate-coverage
+
+ensure:
+		dep ensure
+
+package: 	compile
+
+compile: 	main.go
+				    CGO_ENABLED=0 go build -i -o ${BIN_DIR} main.go
+
+test:
+		  go test ./... -v
+
+travis-before-build:	travis-before-build-step
+
+travis-before-build-step:
+							export PATH=$PATH:$HOME/gopath/bin
+							go get -u golang.org/x/tools/cmd/cover
+							go get -u github.com/golang/dep/cmd/dep
+
+travis-build-step:
+					dep ensure
+
+travis-script-step:
+					set -e
+					bash ${GOMETA_LINTER}
+					CGO_ENABLED=0 go build -i -o ${BIN_DIR} main.go
+					go test -cover ./...

makefile

@@ -12,7 +12,7 @@
     "build": "docker-compose build",
     "lint": "eslint --ext .js .",
     "lint:fix": "eslint --fix --ext .js .",
-    "go": "go run main.go data.go",
+    "go": "go run *.go",
     "browser": "node browser.js",
     "dev": "docker-compose up frontend backend db redis",
     "dev:server": "npm run go & npm run webpack",