From 49b01c269a2b454a87ccf4fe7c67026b7df280b2 Mon Sep 17 00:00:00 2001 From: michivonah Date: Wed, 2 Apr 2025 10:56:20 +0200 Subject: [PATCH] adjust Dockerfile + add grafana --- grafana/docker-compose.yml | 11 +++++++++++ webservice/Dockerfile.txt | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 grafana/docker-compose.yml diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml new file mode 100644 index 0000000..55e183e --- /dev/null +++ b/grafana/docker-compose.yml @@ -0,0 +1,11 @@ +services: + grafana: + image: grafana/grafana:latest + ports: + - "3000:3000" + environment: + - GF_DATABASE_TYPE=sqlite3 + - GF_DATABASE_SQLITE3_PATH=/var/lib/grafana/grafana.db + volumes: + - ./grafana-data:/var/lib/grafana + restart: unless-stopped \ No newline at end of file diff --git a/webservice/Dockerfile.txt b/webservice/Dockerfile.txt index 40baadf..809a995 100644 --- a/webservice/Dockerfile.txt +++ b/webservice/Dockerfile.txt @@ -8,7 +8,7 @@ WORKDIR /app/ COPY requirements.txt . # Set enviromental variables -ENV DB_CONNECTION_STRING ep-plannerDB +ENV DB_CONNECTION_STRING=ep-plannerDB # Install needed packages RUN pip3 install --upgrade pip @@ -20,6 +20,9 @@ EXPOSE 8080 # Imort script COPY webservice.py . +COPY crypto.py . +COPY dbfunctions.py . +COPY models.py . # Start app CMD ["uvicorn", "webservice:app", "--host", "0.0.0.0", "--port", "8080"] \ No newline at end of file