From 524713f1599361047372a1ba16d29aae1999b80b Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Wed, 25 May 2022 13:08:24 -0500 Subject: [PATCH 1/3] updated dependencies Signed-off-by: Paul Schultz --- .devfile/icon/python.png | Bin 5164 -> 0 bytes app.py | 3 +-- docker/Dockerfile | 28 ++++++++++------------------ requirements.txt | 4 +--- 4 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 .devfile/icon/python.png diff --git a/.devfile/icon/python.png b/.devfile/icon/python.png deleted file mode 100644 index fe26d4a23d8eccdd1dffb24b5ba43222d9e3f634..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5164 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⪙|SFP`+F?4;$fO3&nRC%Ft zh>Wu3w#gsEM<2LVSKPr?`1ZfaB*0Y|`xag&diQ*=)NJiJbfo@_f8)o3CAfy}cXS8X zbkm+#oI)vJ6Oc|#5ebUDuUb$0>MSIk9iY#2)(8RtB9D_z=iWqz5OX_IH5GvQ8R1T= znx&oF$PJFtWyFHAEx{x@QQHa+^CubjoIT8!7& R`QT48BLfp`xjsJP{{UU;+r$6> diff --git a/app.py b/app.py index cad286e543..6e4ab192c9 100644 --- a/app.py +++ b/app.py @@ -1,5 +1,4 @@ from flask import Flask -from waitress import serve app = Flask(__name__) @@ -8,4 +7,4 @@ def hello(): return "Hello World!" if __name__ == '__main__': - serve(app, host='0.0.0.0', port=8080) + app.run(port=8080,host='0.0.0.0') \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 16fdeb3bdc..581cabb6f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,27 +1,19 @@ -#### -# This Dockerfile is used in order to build a container that runs the Spring Boot application -# -# Build the image with: -# -# docker build -f docker/Dockerfile -t python/sample-basic . -# -# Then run the container using: -# -# docker run -i --rm -p 8081:8081 python/sample-basic -#### FROM python:slim -WORKDIR /projects +# By default, listen on port 8081 +EXPOSE 8081/tcp -RUN python3 -m venv venv -RUN . venv/bin/activate +# Set the working directory in the container +WORKDIR /projects -# optimize image caching +# Copy the dependencies file to the working directory COPY requirements.txt . + +# Install any dependencies RUN pip install -r requirements.txt +# Copy the content of the local src directory to the working directory COPY . . -EXPOSE 8081 -CMD [ "waitress-serve", "--port=8081", "app:app"] - +# Specify the command to run on container start +CMD [ "python", "./app.py" ] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 11f782fe58..c97a5aa7b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ -Flask==2.0.0 -itsdangerous==2.0.1 -waitress==2.0.0 \ No newline at end of file +Flask==2.1.0 \ No newline at end of file From 04dcf4266355cef60aeeaa3feffa6d487597b2a2 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Thu, 26 May 2022 13:04:43 -0500 Subject: [PATCH 2/3] added env var for port number Signed-off-by: Paul Schultz --- app.py | 8 +++++++- docker/Dockerfile | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 6e4ab192c9..66b2ab4db4 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,5 @@ from flask import Flask +import os app = Flask(__name__) @@ -7,4 +8,9 @@ def hello(): return "Hello World!" if __name__ == '__main__': - app.run(port=8080,host='0.0.0.0') \ No newline at end of file + port = int(os.environ.get('FLASK_PORT')) + + if port == None: + port = 8080 + + app.run(port=port,host='0.0.0.0') \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 581cabb6f7..4e1e68b803 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,6 +2,7 @@ FROM python:slim # By default, listen on port 8081 EXPOSE 8081/tcp +ENV FLASK_PORT=8081 # Set the working directory in the container WORKDIR /projects From f70c2937d5303704fb423d83478ac94efdf96f8d Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Thu, 26 May 2022 13:15:54 -0500 Subject: [PATCH 3/3] replaced if statement with ternary Signed-off-by: Paul Schultz --- app.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app.py b/app.py index 66b2ab4db4..ebb495458d 100644 --- a/app.py +++ b/app.py @@ -8,9 +8,6 @@ def hello(): return "Hello World!" if __name__ == '__main__': - port = int(os.environ.get('FLASK_PORT')) - - if port == None: - port = 8080 + port = int(os.environ.get('FLASK_PORT')) or 8080 app.run(port=port,host='0.0.0.0') \ No newline at end of file