From bb8d8bcfe6b45a1b44810daf1daf016d75e11e68 Mon Sep 17 00:00:00 2001
From: Nikita Tokarchuk <nikita@tokarch.uk>
Date: Sun, 5 Jan 2020 18:18:45 +0100
Subject: [PATCH] fix task1 dockerfile

---
 deploy/task1/docker-compose.yml                           | 4 ++--
 deploy/task1/Dockerfile.task1 => task1-backend/Dockerfile | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename deploy/task1/Dockerfile.task1 => task1-backend/Dockerfile (66%)

diff --git a/deploy/task1/docker-compose.yml b/deploy/task1/docker-compose.yml
index e42d276..d433502 100644
--- a/deploy/task1/docker-compose.yml
+++ b/deploy/task1/docker-compose.yml
@@ -11,8 +11,8 @@ services:
         ipv4_address: 10.103.204.1
   backend1:
     build:
-      dockerfile: ./Dockerfile.task1
-      context: ../../task1-backend
+      dockerfile: ./task1-backend/Dockerfile
+      context: ../..
     restart: unless-stopped
     networks:
       net: {}
diff --git a/deploy/task1/Dockerfile.task1 b/task1-backend/Dockerfile
similarity index 66%
rename from deploy/task1/Dockerfile.task1
rename to task1-backend/Dockerfile
index 26d9a06..ae2549e 100644
--- a/deploy/task1/Dockerfile.task1
+++ b/task1-backend/Dockerfile
@@ -6,7 +6,7 @@ ENV PATH ${GOPATH}/bin:${PATH}
 RUN mkdir -p /app
 WORKDIR /app
 
-RUN apk add --no-cache go git curl
+RUN apk add --no-cache go git curl gcc g++ make
 
 COPY . .
 RUN go build -o task1 github.com/mainnika/a-quest/task1-backend
@@ -19,8 +19,8 @@ ENV PATH ${GOPATH}/bin:${PATH}
 RUN mkdir -p /app
 WORKDIR /app
 
-COPY --from=builder task1 .
-COPY --from=builder task1-backend/config .
+COPY --from=builder /app/task1 .
+COPY --from=builder /app/task1-backend/config .
 
 EXPOSE 8081