🚚 Move dockerfiles to docker folder

gleich · Dec 19, 2020 · 8377f16 · 8377f16
1 parent a356c18
commit 8377f16
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -38,15 +38,15 @@ jobs:
       - name: Linting Dockerfile
         uses: brpaz/hadolint-action@master
         with:
-          dockerfile: 'Dockerfile'
+          dockerfile: "docker/Dockerfile"
       - name: Linting dev.Dockerfile
         uses: brpaz/hadolint-action@master
         with:
-          dockerfile: 'dev.Dockerfile'
+          dockerfile: "docker/dev.Dockerfile"
       - name: Linting dev.lint.Dockerfile
         uses: brpaz/hadolint-action@master
         with:
-          dockerfile: 'dev.lint.Dockerfile'
+          dockerfile: "docker/dev.lint.Dockerfile"
   in-docker:
     runs-on: ubuntu-latest
     steps:

diff --git a/Makefile b/Makefile
@@ -3,11 +3,11 @@
 ##########
 
 build-docker-prod:
-	docker build -t mattgleich/ctree:latest .
+	docker build -f docker/Dockerfile -t mattgleich/ctree:latest .
 build-docker-dev:
-	docker build -f dev.Dockerfile -t mattgleich/ctree:test .
+	docker build -f docker/dev.Dockerfile -t mattgleich/ctree:test .
 build-docker-dev-lint:
-	docker build -f dev.lint.Dockerfile -t mattgleich/ctree:lint .
+	docker build -f docker/dev.lint.Dockerfile -t mattgleich/ctree:lint .
 build-go:
 	go get -v -t -d ./...
 	go build -v .
@@ -26,9 +26,9 @@ lint-gomod:
 lint-goreleaser:
 	goreleaser check
 lint-hadolint:
-	hadolint Dockerfile
-	hadolint dev.Dockerfile
-	hadolint dev.lint.Dockerfile
+	hadolint docker/Dockerfile
+	hadolint docker/dev.Dockerfile
+	hadolint docker/dev.lint.Dockerfile
 lint-in-docker: build-docker-dev-lint
 	docker run mattgleich/ctree:lint
 

diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
diff --git a/dev.Dockerfile → docker/dev.Dockerfile b/dev.Dockerfile → docker/dev.Dockerfile
diff --git a/dev.lint.Dockerfile → docker/dev.lint.Dockerfile b/dev.lint.Dockerfile → docker/dev.lint.Dockerfile
diff --git a/fsync.yml b/fsync.yml
@@ -17,11 +17,11 @@ files:
     source: https://github.com/Matt-Gleich/go_template/blob/master/.gitignore
   - path: LICENSE.md
     source: https://github.com/Matt-Gleich/Matt-Gleich/blob/master/standard_documents/licenses/MIT_LICENSE.md
-  - path: dev.lint.Dockerfile
+  - path: docker/dev.lint.Dockerfile
     source: https://github.com/Matt-Gleich/go_template/blob/master/dev.lint.Dockerfile
-  - path: dev.Dockerfile
+  - path: docker/dev.Dockerfile
     source: https://github.com/Matt-Gleich/go_template/blob/master/dev.Dockerfile
-  - path: Dockerfile
+  - path: docker/Dockerfile
     source: https://github.com/Matt-Gleich/go_template/blob/master/Dockerfile
   - path: CONTRIBUTING.md
     source: https://github.com/Matt-Gleich/go_template/blob/master/CONTRIBUTING.md