Browse Source

Move embed-static.sh into scripts folder

pull/762/head
Fabian Reinartz 10 years ago
parent
commit
027d8968d5
  1. 2
      Dockerfile
  2. 0
      scripts/embed-static.sh
  3. 2
      web/Makefile

2
Dockerfile

@ -9,7 +9,7 @@ RUN apk add --update -t build-deps go git mercurial vim \
&& go get github.com/tools/godep \ && go get github.com/tools/godep \
&& cd /go/src/github.com/prometheus/prometheus \ && cd /go/src/github.com/prometheus/prometheus \
&& $GOPATH/bin/godep restore && go get -d \ && $GOPATH/bin/godep restore && go get -d \
&& ./utility/embed-static.sh web/static web/templates | gofmt > web/blob/files.go \ && ./scripts/embed-static.sh web/static web/templates | gofmt > web/blob/files.go \
&& go build -ldflags " \ && go build -ldflags " \
-X main.buildVersion $(cat VERSION) \ -X main.buildVersion $(cat VERSION) \
-X main.buildRevision $(git rev-parse --short HEAD) \ -X main.buildRevision $(git rev-parse --short HEAD) \

0
utility/embed-static.sh → scripts/embed-static.sh

2
web/Makefile

@ -20,7 +20,7 @@ SUFFIXES:
blob/files.go: $(shell find templates/ static/ -type f) blob/files.go: $(shell find templates/ static/ -type f)
# Note that embed-static.sh excludes map files and the # Note that embed-static.sh excludes map files and the
# non-minified bootstrap files. # non-minified bootstrap files.
../utility/embed-static.sh static templates | $(GOFMT) > $@ ../scripts/embed-static.sh static templates | $(GOFMT) > $@
clean: clean:
-rm -f blob/files.go -rm -f blob/files.go

Loading…
Cancel
Save