From a6cd871f888f8c69ce6b6248ecc98ccbd3ef344d Mon Sep 17 00:00:00 2001 From: felix0496 Date: Thu, 20 Oct 2022 17:44:27 +0200 Subject: [PATCH 1/3] Use common refinery parent image --- Dockerfile | 4 ++-- dev.Dockerfile | 4 ++-- requirements.txt | 17 ++++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb82bec..d8af36c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM python:3.9-slim +FROM kernai/refinery-parent-images:v0.0.1-common WORKDIR /program COPY requirements.txt . -RUN pip3 install -r requirements.txt +RUN pip3 install --no-cache-dir -r requirements.txt COPY / . diff --git a/dev.Dockerfile b/dev.Dockerfile index c9dcf17..7590166 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM kernai/refinery-parent-images:v0.0.1-common WORKDIR /app @@ -6,7 +6,7 @@ VOLUME ["/app"] COPY requirements.txt . -RUN pip3 install -r requirements.txt +RUN pip3 install --no-cache-dir -r requirements.txt COPY / . diff --git a/requirements.txt b/requirements.txt index a55f94f..0362053 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,11 @@ -fastapi==0.70.0 -pandas==1.3.4 -psycopg2-binary==2.9.3 -pydantic==1.8.2 +fastapi +pandas +psycopg2-binary +pydantic requests -SQLAlchemy==1.4.32 -uvicorn==0.15.0 -weak-nlp==0.0.11 +SQLAlchemy +uvicorn +weak-nlp==0.0.12 + +# additional weak-nlp requirements +numpy \ No newline at end of file From d4110221c351a6dac7ee942845b7bb76c8c60f0e Mon Sep 17 00:00:00 2001 From: felix0496 Date: Tue, 25 Oct 2022 14:52:57 +0200 Subject: [PATCH 2/3] updates requirements, use pip-compile --- Dockerfile | 2 +- dev.Dockerfile | 2 +- requirements.txt | 116 ++++++++++++++++++++++++--- requirements/common-requirements.txt | 77 ++++++++++++++++++ requirements/requirements.in | 2 + 5 files changed, 187 insertions(+), 12 deletions(-) create mode 100644 requirements/common-requirements.txt create mode 100644 requirements/requirements.in diff --git a/Dockerfile b/Dockerfile index d8af36c..b06e93a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM kernai/refinery-parent-images:v0.0.1-common +FROM kernai/refinery-parent-images:v0.0.3-common WORKDIR /program diff --git a/dev.Dockerfile b/dev.Dockerfile index 7590166..a212073 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v0.0.1-common +FROM kernai/refinery-parent-images:v0.0.3-common WORKDIR /app diff --git a/requirements.txt b/requirements.txt index 0362053..72acc36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,107 @@ -fastapi -pandas -psycopg2-binary -pydantic -requests -SQLAlchemy -uvicorn +# +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: +# +# pip-compile --output-file=requirements.txt requirements/requirements.in +# +anyio==3.6.2 + # via + # -r requirements/common-requirements.txt + # starlette +boto3==1.25.0 + # via -r requirements/common-requirements.txt +botocore==1.28.0 + # via + # -r requirements/common-requirements.txt + # boto3 + # s3transfer +certifi==2022.9.24 + # via + # -r requirements/common-requirements.txt + # minio + # requests +charset-normalizer==2.1.1 + # via + # -r requirements/common-requirements.txt + # requests +click==8.1.3 + # via + # -r requirements/common-requirements.txt + # uvicorn +fastapi==0.85.1 + # via -r requirements/common-requirements.txt +h11==0.14.0 + # via + # -r requirements/common-requirements.txt + # uvicorn +idna==3.4 + # via + # -r requirements/common-requirements.txt + # anyio + # requests +jmespath==1.0.1 + # via + # -r requirements/common-requirements.txt + # boto3 + # botocore +minio==7.1.12 + # via -r requirements/common-requirements.txt +numpy==1.23.4 + # via + # -r requirements/common-requirements.txt + # pandas + # weak-nlp +pandas==1.5.1 + # via + # -r requirements/common-requirements.txt + # weak-nlp +psycopg2-binary==2.9.4 + # via -r requirements/common-requirements.txt +pydantic==1.10.2 + # via + # -r requirements/common-requirements.txt + # fastapi +python-dateutil==2.8.2 + # via + # -r requirements/common-requirements.txt + # botocore + # pandas +pytz==2022.5 + # via + # -r requirements/common-requirements.txt + # pandas +requests==2.28.1 + # via -r requirements/common-requirements.txt +s3transfer==0.6.0 + # via + # -r requirements/common-requirements.txt + # boto3 +six==1.16.0 + # via + # -r requirements/common-requirements.txt + # python-dateutil +sniffio==1.3.0 + # via + # -r requirements/common-requirements.txt + # anyio +sqlalchemy==1.4.42 + # via -r requirements/common-requirements.txt +starlette==0.20.4 + # via + # -r requirements/common-requirements.txt + # fastapi +typing-extensions==4.4.0 + # via + # -r requirements/common-requirements.txt + # pydantic + # starlette +urllib3==1.26.12 + # via + # -r requirements/common-requirements.txt + # botocore + # minio + # requests +uvicorn==0.19.0 + # via -r requirements/common-requirements.txt weak-nlp==0.0.12 - -# additional weak-nlp requirements -numpy \ No newline at end of file + # via -r requirements/requirements.in diff --git a/requirements/common-requirements.txt b/requirements/common-requirements.txt new file mode 100644 index 0000000..422c662 --- /dev/null +++ b/requirements/common-requirements.txt @@ -0,0 +1,77 @@ +# +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: +# +# pip-compile requirements/common-requirements.in +# +anyio==3.6.2 + # via starlette +boto3==1.25.0 + # via -r requirements/common-requirements.in +botocore==1.28.0 + # via + # boto3 + # s3transfer +certifi==2022.9.24 + # via + # minio + # requests +charset-normalizer==2.1.1 + # via requests +click==8.1.3 + # via uvicorn +fastapi==0.85.1 + # via -r requirements/mini-requirements.in +h11==0.14.0 + # via uvicorn +idna==3.4 + # via + # anyio + # requests +jmespath==1.0.1 + # via + # boto3 + # botocore +minio==7.1.12 + # via -r requirements/common-requirements.in +numpy==1.23.4 + # via + # -r requirements/common-requirements.in + # pandas +pandas==1.5.1 + # via -r requirements/common-requirements.in +psycopg2-binary==2.9.4 + # via -r requirements/common-requirements.in +pydantic==1.10.2 + # via + # -r requirements/mini-requirements.in + # fastapi +python-dateutil==2.8.2 + # via + # botocore + # pandas +pytz==2022.5 + # via pandas +requests==2.28.1 + # via -r requirements/mini-requirements.in +s3transfer==0.6.0 + # via boto3 +six==1.16.0 + # via python-dateutil +sniffio==1.3.0 + # via anyio +sqlalchemy==1.4.42 + # via -r requirements/common-requirements.in +starlette==0.20.4 + # via fastapi +typing-extensions==4.4.0 + # via + # pydantic + # starlette +urllib3==1.26.12 + # via + # botocore + # minio + # requests +uvicorn==0.19.0 + # via -r requirements/mini-requirements.in diff --git a/requirements/requirements.in b/requirements/requirements.in new file mode 100644 index 0000000..ba36fb9 --- /dev/null +++ b/requirements/requirements.in @@ -0,0 +1,2 @@ +-r common-requirements.txt +weak-nlp==0.0.12 From 89c93e7161d19f7d3492ce8661be69dfd0927cb9 Mon Sep 17 00:00:00 2001 From: felix0496 Date: Wed, 26 Oct 2022 13:49:38 +0200 Subject: [PATCH 3/3] set parent image version to v1.5.0 --- Dockerfile | 2 +- dev.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b06e93a..b37bc1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM kernai/refinery-parent-images:v0.0.3-common +FROM kernai/refinery-parent-images:v1.5.0-common WORKDIR /program diff --git a/dev.Dockerfile b/dev.Dockerfile index a212073..a5cee81 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v0.0.3-common +FROM kernai/refinery-parent-images:v1.5.0-common WORKDIR /app