From e06ceb31fc0026cf16a9f4690fa44e1b48e9658e Mon Sep 17 00:00:00 2001
From: Guillaume Charest <1690085+gcharest@users.noreply.github.com>
Date: Thu, 18 Apr 2024 17:01:24 +0000
Subject: [PATCH] fix: initial upload of the file with directory

---
 .github/workflows/build_and_deploy.yml | 2 +-
 .github/workflows/ci_container.yml     | 2 +-
 Dockerfile                             | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 496f4cfd..88287c81 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Download GeoDB from S3
         run: |
-          aws s3 cp s3://${{ secrets.GEO_DB_BUCKET }}/GeoLite2-City.tar.gz ./app/geodb/GeoLite2-City.tar.gz
+          aws s3 cp s3://${{ secrets.GEO_DB_BUCKET }}/GeoLite2-City.tar.gz ./GeoLite2-City.tar.gz
 
       - name: Login to Amazon ECR
         id: login-ecr
diff --git a/.github/workflows/ci_container.yml b/.github/workflows/ci_container.yml
index 4cc5ad5c..2b0bdfeb 100644
--- a/.github/workflows/ci_container.yml
+++ b/.github/workflows/ci_container.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Download GeoDB from S3
         run: |
-          aws s3 cp s3://${{ secrets.GEO_DB_BUCKET }}/GeoLite2-City.tar.gz ./app/geodb/GeoLite2-City.tar.gz
+          aws s3 cp s3://${{ secrets.GEO_DB_BUCKET }}/GeoLite2-City.tar.gz ./GeoLite2-City.tar.gz
 
       - name: Build container
         working-directory: ./
diff --git a/Dockerfile b/Dockerfile
index c6b0cdd9..558e375e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,11 +23,9 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY app/ .
 
-COPY app/geodb/GeoLite2-City.tar.gz /app/geodb/GeoLite2-City.tar.gz
+COPY GeoLite2-City.tar.gz /app/geodb/GeoLite2-City.tar.gz
 
 RUN tar -xzvf /app/geodb/GeoLite2-City.tar.gz -C /app/geodb
-RUN cp /app/geodb/GeoLite2-City_*/GeoLite2-City.mmdb /app/geodb/GeoLite2-City.mmdb
-RUN rm -rf /app/geodb/GeoLite2-City_*
 RUN rm /app/geodb/GeoLite2-City.tar.gz
 
 COPY app/bin/entry.sh /app/entry.sh