default formatting for Dockerfile, remove cache on build

htmlgraphic · May 28, 2019 · 90347ee · 90347ee
1 parent 49c072d
commit 90347ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -16,5 +16,9 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
+[Dockerfile]
+indent_style = space
+indent_size = 2
+
 [Makefile]
 indent_style = tab
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Build a container via the command "make build"
 # By Jason Gegere <jason@htmlgraphic.com>
 
-TAG 		= 1.8.0
+TAG 		= 1.8.1
 CONTAINER 	= apache
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(CONTAINER)
@@ -34,7 +34,7 @@ env:
 
 build:
 	@make env
-	docker build \
+	docker build --no-cache \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		--rm -t $(IMAGE_NAME):$(TAG) -t $(IMAGE_NAME):latest .