From 9f868197d7914ee3437ed8c4f6933081513fc70e Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Wed, 17 Feb 2021 18:42:50 +0300
Subject: [PATCH] update project structure

---
 Dockerfile                                           | 2 +-
 Makefile                                             | 6 +++---
 docker-compose.yml => deployments/docker-compose.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename docker-compose.yml => deployments/docker-compose.yml (88%)

diff --git a/Dockerfile b/Dockerfile
index d5a9060..7c26cd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:alpine as golang
 
-COPY ./app /app
+COPY app /app
 WORKDIR /app
 
 RUN go build -o main .
diff --git a/Makefile b/Makefile
index b952292..50328f7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@ MAKEFLAGS += --silent
 .PHONY: *
 
 build:
-	docker-compose -f docker-compose.yml build
+	docker-compose --file deployments/docker-compose.yml --project-name rss-aggregator build
 
 start: build
-	docker-compose -f docker-compose.yml up -d
+	docker-compose --file deployments/docker-compose.yml --project-name rss-aggregator up -d
 down:
-	docker-compose -f docker-compose.yml down
+	docker-compose --file deployments/docker-compose.yml --project-name rss-aggregator down
 
 restart: down start
 
diff --git a/docker-compose.yml b/deployments/docker-compose.yml
similarity index 88%
rename from docker-compose.yml
rename to deployments/docker-compose.yml
index e0482e9..68f6035 100644
--- a/docker-compose.yml
+++ b/deployments/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
     rss-aggregator:
         build:
-            context: .
+            context: ../
         restart: always
         container_name: rss-aggregator
         hostname: rss-aggregator