From 6e7d637ce66c7152176e9f8d5af4a07d6a96720b Mon Sep 17 00:00:00 2001
From: helderbetiol <37706737+helderbetiol@users.noreply.github.com>
Date: Wed, 10 Jan 2024 23:00:48 +0100
Subject: [PATCH 1/2] fix(api) docker location to add git

---
 API/Dockerfile                   | 7 ++++---
 deploy/docker/docker-compose.yml | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/API/Dockerfile b/API/Dockerfile
index ecd0f81fb..14b2fd167 100644
--- a/API/Dockerfile
+++ b/API/Dockerfile
@@ -7,10 +7,11 @@ WORKDIR /home
 
 RUN apt install git
 
-COPY go.mod go.sum /home/
+COPY API/go.mod API/go.sum /home/
 RUN go mod download
 
-COPY . .git* /home/
+COPY API/ /home/
+COPY .git /home/
 
 #Build
 RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -20,6 +21,6 @@ FROM busybox:latest
 USER root
 WORKDIR /home
 
-COPY resources/test/ /home/resources/test/
+COPY API/resources/test/ /home/resources/test/
 COPY --from=builder /home/main /home
 ENTRYPOINT [ "/home/main" ]
\ No newline at end of file
diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
index c4586a2fe..2c8b9253b 100644
--- a/deploy/docker/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -2,7 +2,8 @@ version: '3.9'
 services:
   ogree_api:
     build:
-      context: ${CORE_DIR}/${API_BUILD_DIR}
+      context: ${CORE_DIR}
+      dockerfile: ${API_BUILD_DIR}/Dockerfile
     image: ogree/api:${IMAGE_TAG}
     container_name: ${COMPOSE_PROJECT_NAME}_api
     environment:

From 126d162e723c015341c38217d4738239275cab6d Mon Sep 17 00:00:00 2001
From: helderbetiol <37706737+helderbetiol@users.noreply.github.com>
Date: Wed, 10 Jan 2024 23:26:44 +0100
Subject: [PATCH 2/2] fix(ci) keep git dir with docker compose

---
 deploy/docker/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
index 2c8b9253b..1036aa408 100644
--- a/deploy/docker/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -4,6 +4,8 @@ services:
     build:
       context: ${CORE_DIR}
       dockerfile: ${API_BUILD_DIR}/Dockerfile
+      args:
+        BUILDKIT_CONTEXT_KEEP_GIT_DIR: true
     image: ogree/api:${IMAGE_TAG}
     container_name: ${COMPOSE_PROJECT_NAME}_api
     environment: