Go/* remote TE dependencies and base files [ci lang-only Go] (#3512)

TechEmpower · Apr 7, 2018 · da5826d · da5826d
1 parent 2e1463a
commit da5826d
Show file tree

Hide file tree

Showing 26 changed files with 109 additions and 64 deletions.
diff --git a/frameworks/Go/aah/aah.dockerfile b/frameworks/Go/aah/aah.dockerfile
@@ -1,4 +1,6 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
+
+RUN apt update -yqq && apt install unzip
 
 ADD ./ /aah
 WORKDIR /aah

diff --git a/frameworks/Go/aah/src/benchmark/app/db/datasource.go b/frameworks/Go/aah/src/benchmark/app/db/datasource.go
@@ -3,7 +3,6 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"os"
 	"runtime"
 
 	"aahframework.org/aah.v0"
@@ -26,10 +25,7 @@ func DB() *sql.DB {
 // DatabaseInit initializes the Database.
 func DatabaseInit(e *aah.Event) {
 	cfg := aah.AppConfig()
-	dbHost := os.Getenv("DBHOST")
-	if dbHost == "" {
-		dbHost = "localhost"
-	}
+	dbHost := "tfb-database"
 
 	dbURL := fmt.Sprintf(cfg.StringDefault("datasource.benchmark.url", ""), dbHost)
 

diff --git a/frameworks/Go/beego/beego-orm-mysql.dockerfile b/frameworks/Go/beego/beego-orm-mysql.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /beego
 WORKDIR /beego

diff --git a/frameworks/Go/beego/beego.dockerfile b/frameworks/Go/beego/beego.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /beego
 WORKDIR /beego

diff --git a/frameworks/Go/echo/echo.dockerfile b/frameworks/Go/echo/echo.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /echo
 WORKDIR /echo

diff --git a/frameworks/Go/echo/src/app/main.go b/frameworks/Go/echo/src/app/main.go
@@ -9,7 +9,6 @@ import (
 	"log"
 	"math/rand"
 	"net/http"
-	"os"
 	"sort"
 	"strconv"
 
@@ -265,10 +264,7 @@ func InitRoutes(e *echo.Echo) {
 }
 
 func InitPostgres() {
-	host := os.Getenv("DBHOST")
-	if host == "" {
-		host = "localhost"
-	}
+	host := "tfb-database"
 
 	var err error
 	db, err = sql.Open("postgres", fmt.Sprintf(connectionString, host))

diff --git a/frameworks/Go/falcore/falcore.dockerfile b/frameworks/Go/falcore/falcore.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /falcore
 WORKDIR /falcore

diff --git a/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile b/frameworks/Go/fasthttp/fasthttp-postgresql.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /fasthttp
 WORKDIR /fasthttp

diff --git a/frameworks/Go/fasthttp/fasthttp.dockerfile b/frameworks/Go/fasthttp/fasthttp.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /fasthttp
 WORKDIR /fasthttp

diff --git a/frameworks/Go/gin/gin.dockerfile b/frameworks/Go/gin/gin.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /gin
 WORKDIR /gin

diff --git a/frameworks/Go/gin/hello.go b/frameworks/Go/gin/hello.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"math/rand"
-	"os"
 	"runtime"
 	"sort"
 	"strconv"
@@ -161,7 +160,7 @@ func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	dsn := "benchmarkdbuser:benchmarkdbpass@tcp(%s:3306)/hello_world"
-	dbhost := os.Getenv("DBHOST")
+	dbhost := "tfb-database"
 
 	db, err := sql.Open("mysql", fmt.Sprintf(dsn, dbhost))
 	if err != nil {

diff --git a/frameworks/Go/go-std/go-base.dockerfile b/frameworks/Go/go-std/go-base.dockerfile
diff --git a/frameworks/Go/go-std/go-interpolate.dockerfile b/frameworks/Go/go-std/go-interpolate.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go
diff --git a/frameworks/Go/go-std/go-mongo.dockerfile b/frameworks/Go/go-std/go-mongo.dockerfile
@@ -1,5 +1,12 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
 
-RUN apt-get install -y libsasl2-dev
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN apt update -yqq && apt install -yqq libsasl2-dev
 RUN go get gopkg.in/mgo.v2
 CMD go run hello_mongo.go
diff --git a/frameworks/Go/go-std/go-postgres.dockerfile b/frameworks/Go/go-std/go-postgres.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/lib/pq
 CMD go run hello_postgres.go
diff --git a/frameworks/Go/go-std/go-prefork.dockerfile b/frameworks/Go/go-std/go-prefork.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go -prefork
diff --git a/frameworks/Go/go-std/go.dockerfile b/frameworks/Go/go-std/go.dockerfile
@@ -1,4 +1,11 @@
-FROM techempower/go-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /go-std
+WORKDIR /go-std
+
+RUN mkdir bin
+ENV GOPATH /go-std
+ENV PATH ${GOPATH}/bin:${PATH}
 
 RUN go get github.com/go-sql-driver/mysql
 CMD go run hello_mysql.go
diff --git a/frameworks/Go/goji/goji.dockerfile b/frameworks/Go/goji/goji.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /goji
 WORKDIR /goji

diff --git a/frameworks/Go/kami/kami.dockerfile b/frameworks/Go/kami/kami.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /kami
 WORKDIR /kami

diff --git a/frameworks/Go/revel/revel-base.dockerfile b/frameworks/Go/revel/revel-base.dockerfile
diff --git a/frameworks/Go/revel/revel-jet.dockerfile b/frameworks/Go/revel/revel-jet.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel-qbs.dockerfile b/frameworks/Go/revel/revel-qbs.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel-raw.dockerfile b/frameworks/Go/revel/revel-raw.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/revel/revel.dockerfile b/frameworks/Go/revel/revel.dockerfile
@@ -1,3 +1,15 @@
-FROM techempower/revel-base:0.1
+FROM golang:1.10.1
+
+ADD ./ /revel
+WORKDIR /revel
+
+RUN mkdir bin
+ENV GOPATH /revel
+ENV PATH ${GOPATH}/bin:${PATH}
+
+RUN go get -u github.com/go-sql-driver/mysql
+RUN go get -u github.com/revel/cmd/revel
+RUN go get -u github.com/coocood/qbs
+RUN go get -u github.com/eaigner/jet
 
 CMD revel run benchmark prod
diff --git a/frameworks/Go/webgo/webgo.dockerfile b/frameworks/Go/webgo/webgo.dockerfile
@@ -1,4 +1,4 @@
-FROM techempower/go-lang:0.1
+FROM golang:1.10.1
 
 ADD ./ /webgo
 WORKDIR /webgo

diff --git a/toolset/setup/docker/languages/go-lang.dockerfile b/toolset/setup/docker/languages/go-lang.dockerfile