Merge pull request #155 from moul/dev/moul/update-web-editor

moul · May 20, 2020 · 57c04e0 · 57c04e0
2 parents a0668cc + 1c966f6
commit 57c04e0
Show file tree

Hide file tree

Showing 7 changed files with 168 additions and 17 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+*~
+.git/
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,18 @@
-FROM		znly/protoc:0.3.0
+# builder
+FROM    golang:1.14-alpine as builder
+RUN     apk --no-cache add make git go rsync libc-dev
+RUN     go get -u golang.org/x/tools/cmd/goimports
+RUN     go get -u github.com/gobuffalo/packr/v2/packr2
+COPY    . /go/src/moul.io/protoc-gen-gotemplate
+WORKDIR /go/src/moul.io/protoc-gen-gotemplate
+RUN     packr2
+RUN     go install -a -tags netgo -ldflags '-w -extldflags "-static"' . ./cmd/web-editor
+RUN     ls -la /go/bin
 
-ENV		GOPATH=/go \
-		PATH=/go/bin:${PATH}
-
-# Install deps and common tools
-RUN		apk --update add make git go rsync libc-dev \
- &&		go get -u golang.org/x/tools/cmd/goimports
-
-# Install protoc-gen-gotemplate
-COPY		. /go/src/moul.io/protoc-gen-gotemplate
-WORKDIR		/go/src/moul.io/protoc-gen-gotemplate
-RUN		git remote set-url origin https://github.com/moul/protoc-gen-gotemplate
-RUN		go install . ./cmd/web-editor
+# runtime
+FROM    znly/protoc:0.3.0
+COPY    --from=builder  /go/bin/web-editor            /go/bin/
+COPY    --from=builder  /go/bin/protoc-gen-gotemplate /go/bin/
+ENV     PATH=$PATH:/go/bin
+EXPOSE  8080
+ENTRYPOINT []
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 GOPKG ?= moul.io/protoc-gen-gotemplate
-DOCKER_IMAGE ?= moul/golang-repo-template
+DOCKER_IMAGE ?= moul/protoc-gen-gotemplate
 GOBINS ?= . ./cmd/web-editor
 GOLIBS ?= .
 

diff --git a/cmd/web-editor/main.go b/cmd/web-editor/main.go
@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	packr "github.com/gobuffalo/packr/v2"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 )
@@ -101,7 +102,9 @@ func returnError(w http.ResponseWriter, err error) {
 func main() {
 	r := mux.NewRouter()
 
-	r.Handle("/", http.FileServer(http.Dir("static")))
+	box := packr.New("static", "./static")
+
+	r.Handle("/", http.FileServer(box))
 	r.HandleFunc("/generate", generate)
 	addr := fmt.Sprintf(":%s", os.Getenv("PORT"))
 	if addr == ":" {

diff --git a/cmd/web-editor/static/index.html b/cmd/web-editor/static/index.html
@@ -90,7 +90,7 @@
 
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
-    <style>.ace_editor { height: 80%; }</style>
+    <style>.ace_editor { height: 80%; min-height: 500px; }</style>
   </head>
   <body ng-app="pggt">
     <div class="container-fluid" ng-controller="PggtCtrl">

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum