fix: pkger support for makefile & Dockerfile

xmlking · Nov 15, 2019 · e74aa9d · e74aa9d
1 parent e774cf8
commit e74aa9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -44,7 +44,7 @@ ARG VERSION=0.0.1
 ARG TYPE=srv
 ARG TARGET=account
 
-RUN pkger -o $TYPE/$TARGET -include /deploy/bases/micros/$TARGET-$TYPE/config
+RUN pkger -o $TYPE/$TARGET -include /config
 RUN go build -a \
     -ldflags="-w -s -linkmode external -extldflags '-static' $(govvv -flags -version ${VERSION} -pkg $(go list ./shared/config) )" \
     -o /app ./$TYPE/$TARGET/main.go ./$TYPE/$TARGET/plugin.go

diff --git a/Makefile b/Makefile
@@ -115,12 +115,12 @@ endif
 			for _target in $${type}/*/; do \
 				temp=$${_target%%/}; target=$${temp#*/}; \
 				echo "\tPackaging config for $${target}-$${type}"; \
-				${GOPATH}/bin/pkger -o $${type}/$${target} -include /deploy/bases/micros/$${target}-$${type}/config; \
+				${GOPATH}/bin/pkger -o $${type}/$${target} -include /config; \
 			done \
 		done \
 	else \
 		echo "Packaging config for ${TARGET}-${TYPE}..."; \
-		${GOPATH}/bin/pkger -o ${TYPE}/${TARGET} -include /deploy/bases/micros/${TARGET}-${TYPE}/config ; \
+		${GOPATH}/bin/pkger -o ${TYPE}/${TARGET} -include /config ; \
 	fi
 
 build build-%: pkger-%

diff --git a/cgo.dockerfile b/cgo.dockerfile
@@ -33,7 +33,8 @@ WORKDIR /src
 COPY ./go.mod ./go.sum ./
 # Get dependancies - will also be cached if we won't change mod/sum
 RUN go mod download && \
-    GO111MODULE=off go get github.com/ahmetb/govvv
+    GO111MODULE=off go get github.com/ahmetb/govvv && \
+    go install github.com/markbates/pkger/cmd/pkger
 
 # COPY the source code as the last step
 COPY ./ ./
@@ -43,6 +44,7 @@ ARG VERSION=0.0.1
 ARG TYPE=srv
 ARG TARGET=account
 
+RUN pkger -o $TYPE/$TARGET -include /config
 RUN go build -a \
     -ldflags="-w -s -linkmode external -extldflags '-static' $(govvv -flags -version ${VERSION} -pkg $(go list ./shared/config) )" \
     -o /app ./$TYPE/$TARGET/main.go ./$TYPE/$TARGET/plugin.go

diff --git a/no_cgo.dockerfile b/no_cgo.dockerfile
@@ -31,7 +31,8 @@ WORKDIR /src
 COPY ./go.mod ./go.sum ./
 # Get dependancies - will also be cached if we won't change mod/sum
 RUN go mod download && \
-    GO111MODULE=off go get github.com/ahmetb/govvv
+    GO111MODULE=off go get github.com/ahmetb/govvv && \
+    go install github.com/markbates/pkger/cmd/pkger
 
 # COPY the source code as the last step
 COPY ./ ./
@@ -41,6 +42,7 @@ ARG VERSION=0.0.1
 ARG TYPE=srv
 ARG TARGET=account
 
+RUN pkger -o $TYPE/$TARGET -include /config
 RUN go build -a \
     -ldflags="-w -s $(govvv -flags -version ${VERSION} -pkg $(go list ./shared/config) )" \
     -o /app ./$TYPE/$TARGET/main.go ./$TYPE/$TARGET/plugin.go