From 14d733e9ccb2f4b10e9615b384d66e8d0dc899fb Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Wed, 16 Sep 2020 18:03:02 -0700
Subject: [PATCH] move docker files & eventually docker-compose files into
 'docker' directory.

---
 Dockerfile => docker/Dockerfile                     | 4 ++--
 Dockerfile.collector => docker/Dockerfile.collector | 0
 Dockerfile.web => docker/Dockerfile.web             | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Dockerfile => docker/Dockerfile (96%)
 rename Dockerfile.collector => docker/Dockerfile.collector (100%)
 rename Dockerfile.web => docker/Dockerfile.web (100%)

diff --git a/Dockerfile b/docker/Dockerfile
similarity index 96%
rename from Dockerfile
rename to docker/Dockerfile
index 15514da..aeb2453 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM golang:1.14.4-buster as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
-COPY . /go/src/github.com/analogj/scrutiny
+COPY .. /go/src/github.com/analogj/scrutiny
 
 RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go && \
@@ -17,7 +17,7 @@ FROM node:lts-slim as frontendbuild
 ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
 
 WORKDIR /scrutiny/src
-COPY ./webapp/frontend /scrutiny/src
+COPY ../webapp/frontend /scrutiny/src
 
 RUN npm install -g @angular/cli@9.1.4 && \
     mkdir -p /scrutiny/dist && \
diff --git a/Dockerfile.collector b/docker/Dockerfile.collector
similarity index 100%
rename from Dockerfile.collector
rename to docker/Dockerfile.collector
diff --git a/Dockerfile.web b/docker/Dockerfile.web
similarity index 100%
rename from Dockerfile.web
rename to docker/Dockerfile.web