Merge pull request #7 from t0astt/fix_compose

Fix paths and docker-compose
t0astt · Oct 14, 2021 · 77c20b7 · 77c20b7
2 parents e41596f + b83344b
commit 77c20b7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -11,4 +11,5 @@ After the service is running, the following endpoints will become available:
 their respective total supply values.
 
 ## Changelog
-1.0.0 - Initial API
+* 1.0.1 - Fix paths
+* 1.0.0 - Initial API
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,11 +1,10 @@
 FROM python:3.8.12-alpine3.14 AS builder
-WORKDIR /app
-ADD ../requirements.txt /app
+WORKDIR /api
+ADD requirements.txt /api
 RUN apk add gcc musl-dev
 RUN pip install -r requirements.txt
 
 FROM python:3.8.12-alpine3.14
-WORKDIR /app
-ADD .. /app
-COPY --from=builder /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
-CMD ["python3", "-m", "gunicorn", "-b", "0.0.0.0", "--workers=2", "api:create_app()"]
+WORKDIR /api
+ADD . /api
+COPY --from=builder /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
diff --git a/Pipfile → api/Pipfile b/Pipfile → api/Pipfile
diff --git a/Pipfile.lock → api/Pipfile.lock b/Pipfile.lock → api/Pipfile.lock
diff --git a/requirements.txt → api/requirements.txt b/requirements.txt → api/requirements.txt
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   api:
     build: ./api
-    command: "python3 -m gunicorn -b 0.0.0.0 --workers=2 api:new_app"
+    command: "python3 -m gunicorn -b 0.0.0.0 --workers=2 --chdir .. api:new_app"
     expose:
       - 8000
     environment:

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -1,4 +1,4 @@
 FROM nginx:1.21-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf /etc/nginx/conf.d
+COPY nginx.conf /etc/nginx/conf.d/default.conf