Merge branch 'network-proxy' of github.com:green-coding-berlin/green-…

…metrics-tool into network-proxy
green-coding-solutions · Aug 2, 2023 · b48054a · b48054a
2 parents 89f54ae + 0e1d712
commit b48054a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docker/Dockerfile-gunicorn b/docker/Dockerfile-gunicorn
@@ -11,4 +11,4 @@ RUN pip3 install -r requirements.txt
 
 RUN rm -rf /var/lib/apt/lists/*
 
-ENTRYPOINT ["/bin/gunicorn", "--workers=2", "--log-file=-", "--worker-tmp-dir=/dev/shm", "--threads=4", "--worker-class=gthread",  "--bind", "unix:/tmp/green-coding-api.sock", "-m", "007", "--user", "www-data", "--chdir", "/var/www/green-metrics-tool/api", "-k", "uvicorn.workers.UvicornWorker", "api:app"]
+ENTRYPOINT ["/bin/gunicorn", "--workers=2", "--access-logfile=-", "--error-logfile=-", "--worker-tmp-dir=/dev/shm", "--threads=4", "--worker-class=gthread",  "--bind", "unix:/tmp/green-coding-api.sock", "-m", "007", "--user", "www-data", "--chdir", "/var/www/green-metrics-tool/api", "-k", "uvicorn.workers.UvicornWorker", "api:app"]
diff --git a/docker/requirements.txt b/docker/requirements.txt
@@ -1,12 +1,9 @@
 psycopg[binary]==3.1.9
 fastapi==0.100.1
-uvicorn[standard]==0.23.1
+pandas==2.0.3
+PyYAML==6.0.1
 anybadge==1.14.0
 scipy==1.11.1
 orjson==3.9.2
-
-PyYAML==6.0.1
-pandas==2.0.3
-psycopg[binary]==3.1.9
 pyserial==3.5
 psutil==5.9.5
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ RUN pip3 install -r requirements.txt

		RUN rm -rf /var/lib/apt/lists/*

		ENTRYPOINT ["/bin/gunicorn", "--workers=2", "--log-file=-", "--worker-tmp-dir=/dev/shm", "--threads=4", "--worker-class=gthread", "--bind", "unix:/tmp/green-coding-api.sock", "-m", "007", "--user", "www-data", "--chdir", "/var/www/green-metrics-tool/api", "-k", "uvicorn.workers.UvicornWorker", "api:app"]
		ENTRYPOINT ["/bin/gunicorn", "--workers=2", "--access-logfile=-", "--error-logfile=-", "--worker-tmp-dir=/dev/shm", "--threads=4", "--worker-class=gthread", "--bind", "unix:/tmp/green-coding-api.sock", "-m", "007", "--user", "www-data", "--chdir", "/var/www/green-metrics-tool/api", "-k", "uvicorn.workers.UvicornWorker", "api:app"]