Ver Fonte

[GinR] Fix makefile to work with prefetched gogs

cgars há 7 anos atrás
pai
commit
777ae7fe93
2 ficheiros alterados com 2 adições e 7 exclusões
  1. 0 5
      Makefile
  2. 2 2
      docker/build.sh

+ 0 - 5
Makefile

@@ -58,11 +58,6 @@ bindata: pkg/bindata/bindata.go
 pkg/bindata/bindata.go: $(DATA_FILES)
 	go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/...
 
-less: public/css/gogs.css
-
-public/css/gogs.css: $(LESS_FILES)
-	lessc $< $@
-
 clean:
 	go clean -i ./...
 

+ 2 - 2
docker/build.sh

@@ -12,7 +12,6 @@ go get golang.org/x/crypto/bcrypt
 go get github.com/jteeuwen/go-bindata
 go get github.com/G-Node/gin-doi/src
 go get github.com/G-Node/git-module
-
 go get gopkg.in/yaml.v2
 
 cd ${GOPATH}/src/github.com/jteeuwen/go-bindata/go-bindata
@@ -20,6 +19,7 @@ go install
 
 # Build Gogs
 mkdir -p ${GOPATH}/src/github.com/G-Node/
+rm -rf ${GOPATH}/src/github.com/G-Node/gogs
 ln -s /app/gogs/build ${GOPATH}/src/github.com/G-Node/gogs
 cd ${GOPATH}/src/github.com/G-Node/gogs
 # Needed since git 2.9.3 or 2.9.4
@@ -27,7 +27,7 @@ git config --global http.https://gopkg.in.followRedirects true
 make build TAGS="sqlite cert pam"
 
 # Cleanup GOPATH
-rm -r $GOPATH
+#rm -r $GOPATH
 
 
 # Create git user for Gogs