Build: Remove packr files from build

forsam-education · Aug 1, 2020 · b2cbf12 · b2cbf12
1 parent e971753
commit b2cbf12
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -122,3 +122,6 @@ cerberus
 cerberus.toml
 cerberus2.toml
 config.toml
+
+*-packr.go
+packrd
diff --git a/Makefile b/Makefile
@@ -1,2 +1,2 @@
 build: main.go
-	GO111MODULE=on go build -ldflags="-s -w -X github.com/forsam-education/cerberus/utils.VersionHash=`git rev-parse HEAD` -X github.com/forsam-education/cerberus/utils.BuildTime=`date +%Y-%m-%dT%T%z` -X github.com/forsam-education/cerberus/utils.VersionIdentifier=`git describe --tags`" -o bin/cerberus .
+	packr2 && GO111MODULE=on go build -ldflags="-s -w -X github.com/forsam-education/cerberus/utils.VersionHash=`git rev-parse HEAD` -X github.com/forsam-education/cerberus/utils.BuildTime=`date +%Y-%m-%dT%T%z` -X github.com/forsam-education/cerberus/utils.VersionIdentifier=`git describe --tags`" -o bin/cerberus .
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
@@ -5,6 +5,10 @@ WORKDIR /go/src/cerberus
 ARG version_hash
 
 ADD . /go/src/cerberus
+
+RUN go get -u github.com/gobuffalo/packr/v2/packr2
+
+RUN packr2
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/forsam-education/cerberus/utils.VersionHash=${version_hash}' -X 'github.com/forsam-education/cerberus/utils.BuildTime=`date +%Y-%m-%dT%T%z`'" -o bin/cerberus
 
 FROM scratch

diff --git a/database/database-packr.go b/database/database-packr.go
diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go