Merge pull request #22 from ExpressenAB/dockerfile

added cmd to dockerfile, updated version variable
ExpressenAB · Aug 24, 2020 · fe9da44 · fe9da44
2 parents b1cdabf + 63eeed0
commit fe9da44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,5 @@
 FROM alpine:latest
-
-ARG version=0.0.0
-
-COPY build/cloudmonitor_exporter_${version}_linux_amd64/cloudmonitor_exporter /app/cloudmonitor_exporter
-
-ENTRYPOINT /app/cloudmonitor_exporter
-
+ARG VERSION=0.0.0
+COPY "build/cloudmonitor_exporter_${VERSION}_linux_amd64/cloudmonitor_exporter" "/app/cloudmonitor_exporter"
 EXPOSE 9143
+CMD ["/app/cloudmonitor_exporter"]
diff --git a/Makefile b/Makefile
@@ -44,4 +44,4 @@ rpm: package
 	docker run --rm -i -v $(shell pwd):/docker centos:7 /docker/package/rpm/build_rpm.sh ${VERSION}
 
 docker: xbuild
-	docker build --build-arg version=${VERSION} . -t bonniernews/cloudmonitor_exporter:${VERSION}
+	docker build --build-arg VERSION=${VERSION} . -t bonniernews/cloudmonitor_exporter:${VERSION}