deployment fixed

.gitignore

@@ -0,0 +1,2 @@
+.env
+.swp

Dockerfile

@@ -0,0 +1,27 @@
+FROM golang:1.8
+
+#RUN apt-get update && apt-get install -y git sudo wget golang-go
+#ENV GOROOT=
+#ENV GOPATH=$HOME/work
+#ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
+
+RUN go get github.com/rcrowley/go-tigertonic
+RUN go get github.com/alexedwards/scs
+RUN go get github.com/Jeffail/gabs
+RUN go get github.com/stretchr/testify/assert
+RUN go get github.com/go-sql-driver/mysql
+#RUN go get github.com/mr-ma/paper-review-go
+
+
+# clone paper review
+#WORKDIR /go/src/app
+WORKDIR /go/src/github
+RUN mkdir -p mr-ma/paper-review-go/
+WORKDIR /go/src/github/mr-ma/paper-review-go
+COPY . .
+#WORKDIR /$HOME/work/src/mr-ma
+#RUN git clone https://github.com/mr-ma/paper-review-go.git
+#WORKDIR /$HOME/work/src/mr-ma/paper-review-go
+RUN go build taxonomyserver.go
+#EXPOSE 8080
+#CMD "./taxonomyserver -mysqluser root -mysqlpass kB*6jd<KPa<M2x -listen 0.0.0.0:8080"

data/classification-driver.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	//overriding MySqlDriver
 	//"github.com/go-sql-driver/mysql"
+	"../model"
 	"github.com/Jeffail/gabs"
-	"github.com/mr-ma/paper-review-go/model"
 )
 
 type ClassificationDriver interface {
@@ -104,8 +104,8 @@ type ClassificationDriver interface {
 }
 
 //InitMySQLDriver initialize a new my sql driver instance
-func InitClassificationDriver(user string, password string) ClassificationDriver {
-	return MySQLDriver{username: user, pass: password, database: "classification"}
+func InitClassificationDriver(user string, password string, server string) ClassificationDriver {
+	return MySQLDriver{username: user, pass: password, database: "classification", server: server}
 }
 
 func (d MySQLDriver) Login(email string, password string) (result model.LoginResult, err error) {

data/driver-core.go

@@ -19,14 +19,16 @@ type MySQLDriver struct {
 	username string
 	pass     string
 	database string
+	server   string
 }
 
-
 //OpenDB opens a db connection
 func (d MySQLDriver) OpenDB() (*sql.DB, error) {
-	db, err := sql.Open("mysql", d.username+":"+d.pass+"@/"+d.database)
+	a := d.username + ":" + d.pass + "@" + d.server + "/" + d.database
+	fmt.Println(a)
+	db, err := sql.Open("mysql", d.username+":"+d.pass+"@("+d.server+")/"+d.database)
 	if err != nil {
-		checkErr(err)// Just for example purpose. You should use proper error handling instead of panic
+		checkErr(err) // Just for example purpose. You should use proper error handling instead of panic
 	}
 	return db, err
 }
@@ -44,7 +46,6 @@ func (d MySQLDriver) Query(query string) (*sql.DB, *sql.Stmt, error) {
 	return db, stmtOut, err
 }
 
-
 //Insert general insert function
 func (d MySQLDriver) Insert(tableName string, columns string, values ...interface{}) (affected int64, id int64, err error) {
 	db, err := d.OpenDB()

data/driver_test.go

@@ -3,11 +3,12 @@ package data
 import (
 	"testing"
 
-	"github.com/mr-ma/paper-review-go/model"
+	"../model"
 	"github.com/stretchr/testify/assert"
 )
 
-var db = InitMySQLDriver("root","P$m7d2")
+var db = InitMySQLDriver("root", "P$m7d2")
+
 func TestInitMySQLDriver(t *testing.T) {
 	assert.NotNil(t, db)
 }

data/paper-review-driver.go

@@ -1,15 +1,16 @@
 package data
+
 import (
 	"errors"
 	"fmt"
 	"strconv"
 	//overriding MySqlDriver
+	"../model"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/mr-ma/paper-review-go/model"
 )
 
 type PaperReviewDriver interface {
-  DriverCore
+	DriverCore
 	InsertArticle(article model.Article, researchID int64) (int64, error)
 	InsertResearch(research model.Research) (int64, int64, error)
 	InsertTag(tag model.Tag) (affected int64, id int64, err error)
@@ -34,14 +35,11 @@ type PaperReviewDriver interface {
 	DeleteArticleVotes([]model.Article) (model.Result, error)
 }
 
-
 //InitMySQLDriver initialize a new my sql driver instance
 func InitPaperReviewDriver(user string, password string) PaperReviewDriver {
 	return MySQLDriver{username: user, pass: password, database: "classification"}
 }
 
-
-
 //SelectResearchWithArticles a research with it's associated articles
 func (d MySQLDriver) SelectResearchWithArticles(id int64) (r model.Research, err error) {
 	db, err := d.OpenDB()
@@ -365,7 +363,6 @@ func (d MySQLDriver) ReviewNumPapers(researchID int64, mitarbeiterID int64, limi
 	return articleArray, r, err
 }
 
-
 //InsertArticle insert publication
 func (d MySQLDriver) InsertArticle(article model.Article, researchID int64) (int64, error) {
 	affect, _, err := d.Insert("Articles", "Title=?,Authors=?,year=?,Cited_by=?,Keywords=?,Abstract=?,Journal=?,File=?,Source=?,ResearchId=?",

docker-compose.yml

@@ -0,0 +1,46 @@
+version: '3'
+volumes:
+  data-volume: {}
+services:
+  nginx:
+   container_name: some-nginx
+   image: nginx:alpine
+   restart: always
+   ports:
+   - 80:80
+   - 443:443
+   volumes:
+   - ./nginx/conf.d/nginx.conf:/etc/nginx/nginx.conf:ro
+   command: [nginx-debug, '-g', 'daemon off;']
+   depends_on:
+     - app
+
+  mysql:
+   container_name: some-mysql
+   image: mysql/mysql-server:5.7
+   hostname: mysql
+   ports:
+   - "3306:3306"
+   volumes:
+      - data-volume:/var/lib/mysql3
+      - ./SQLSchema/dumps/26_03_dump.sql:/docker-entrypoint-initdb.d/26_03_dump.sql
+   environment:
+     MYSQL_DATABASE: classification
+     MYSQL_ROOT_PASSWORD: ${ENV_MYSQL_ROOT_PASS}
+     MYSQL_ROOT_HOST: '%'
+   restart: always
+  app:
+    restart: always
+    hostname: taxonomy-tool
+    build: .
+    ports:
+      - "8081:8081"
+    expose:
+      - "8081"
+    env_file:
+      - .env
+    command: /go/src/github/mr-ma/paper-review-go/taxonomyserver -mysqluser root -mysqlpass ${ENV_MYSQL_ROOT_PASS} -mysqlserver mysql:3306 -listen 0.0.0.0:8081
+    depends_on:
+      - mysql
+    links:
+      - mysql