From cae829a563e8ed896322a7fe1676d2522b2ffb9a Mon Sep 17 00:00:00 2001
From: Fjodor van Rijsselberg <fjodorvanrijsselberg@Fjodors-MBP.ia.knaw.local>
Date: Wed, 28 Aug 2024 11:12:17 +0200
Subject: [PATCH] Made port in uvicorn script dynamic. Added port to env
 example.

---
 Dockerfile         | 18 +++++++++++-------
 docker-compose.yml |  3 ++-
 dot_env_example    |  3 ++-
 run.sh             |  3 ++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 84361a5..82a664c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,29 @@
 FROM python:3.12-slim
 
-ARG BASE_DIR
+ARG BASE_DIR=/home/resolution
+ARG PORT=9000
+
+ENV PORT=${PORT}
 ENV BASE_DIR=${BASE_DIR}
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
-RUN useradd -m resolution
+RUN useradd -m -u 1000 -s /bin/bash resolution
 
 WORKDIR $BASE_DIR
 
 COPY pyproject.toml .
 RUN pip install poetry \
     && poetry config virtualenvs.create false \
-    && poetry install
+    && poetry install --no-root
 
-USER resolution
+COPY . $BASE_DIR/app/
+RUN mkdir -p ${BASE_DIR}/logs \
+    && touch ${BASE_DIR}/logs/prm.log \
+    && chown -R resolution:resolution ${BASE_DIR}
 
-RUN mkdir -p $BASE_DIR/logs \
-    && touch $BASE_DIR/logs/prm.log
+USER resolution
 
 WORKDIR $BASE_DIR/app
-COPY . .
 
 ENTRYPOINT ["bash", "./run.sh"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c04860..80ede23 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
       dockerfile: Dockerfile
       args:
         BASE_DIR: ${BASE_DIR}
+        PORT: ${PORT}
     container_name: ${FASTAPI_CONTAINER_NAME}
     volumes:
       - .:/app
@@ -41,7 +42,7 @@ services:
       CELERY_CONFIG: ${CELERY_CONFIG}
       JWT_SECRET_KEY: ${JWT_SECRET_KEY}
     ports:
-      - "9000:9000"
+      - ${PORT}:${PORT}
     networks:
       - app-network
 
diff --git a/dot_env_example b/dot_env_example
index 1fe52a0..312484c 100644
--- a/dot_env_example
+++ b/dot_env_example
@@ -1,6 +1,7 @@
 # Misc
 CELERY_CONFIG=development
 BASE_DIR=/home/resolution
+PORT=9000
 
 # Container names
 RABBIT_CONTAINER_NAME=pidmr_rabbit
@@ -18,4 +19,4 @@ RABBITMQ_DEFAULT_PASS=guest
 RABBITMQ_PORT=5672
 
 #JWT key
-JWT_SECRET_KEY=secret_key
+JWT_SECRET_KEY=kaas
diff --git a/run.sh b/run.sh
index 2cbac14..8a92296 100644
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,3 @@
-uvicorn main:app --host 0.0.0.0 --port 9000 &
+PORT=${PORT:-8080}
+uvicorn main:app --host 0.0.0.0 --port "$PORT" &
 celery -A main.celery worker -l INFO -Q pid-resolution,pidmr,celery --autoscale=1,10