From c72ab30191f904f347677703a1921d87988316be Mon Sep 17 00:00:00 2001 From: Baraa Al-Masri Date: Tue, 6 Feb 2024 16:45:25 +0300 Subject: [PATCH 1/4] chore: update requirements.txt --- requirements.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/requirements.txt b/requirements.txt index 293aab6b..509d0ef3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,37 @@ +async-timeout==4.0.3 +attrs==23.2.0 +cffi==1.16.0 +click==8.1.7 +coverage==6.4.1 cryptography==38.0.4 +Deprecated==1.2.14 +distlib==0.3.8 +fakeredis==1.7.5 +filelock==3.13.1 +flake8==6.0.0 Flask==2.1.2 +freezegun==1.2.1 +iniconfig==2.0.0 itsdangerous==2.1.2 Jinja2==3.1.2 MarkupSafe==2.1.1 +mccabe==0.7.0 +packaging==23.2 +platformdirs==4.2.0 +pluggy==1.4.0 +py==1.11.0 +pycodestyle==2.10.0 +pycparser==2.21 +pyflakes==3.0.1 +pytest==7.1.2 +pytest-cov==3.0.0 +python-dateutil==2.8.2 redis==4.3.3 +six==1.16.0 +sortedcontainers==2.4.0 +toml==0.10.2 +tomli==2.0.1 +tox==3.25.0 +virtualenv==20.25.0 Werkzeug==2.1.2 +wrapt==1.16.0 From 9e969b3b90f4e2883f9ffcb5c2f16b7290a20750 Mon Sep 17 00:00:00 2001 From: Baraa Al-Masri Date: Tue, 6 Feb 2024 17:14:38 +0300 Subject: [PATCH 2/4] chore: add make to docker file --- .dockerignore | 2 +- Dockerfile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 67d158d7..f788d6d4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,7 +6,7 @@ CONTRIBUTING.rst docker-compose.yml Dockerfile -requirements.txt +# requirements.txt tests.py tox.ini diff --git a/Dockerfile b/Dockerfile index d8cccbc6..f4cc281c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,13 @@ RUN groupadd -r snappass && \ WORKDIR $APP_DIR -COPY ["setup.py", "MANIFEST.in", "README.rst", "AUTHORS.rst", "$APP_DIR/"] +COPY ["setup.py", "MANIFEST.in", "README.rst", "AUTHORS.rst", "Makefile", "requirements.txt", "$APP_DIR/"] COPY ["./snappass", "$APP_DIR/snappass"] +RUN apt-get update && \ + apt-get install make + +RUN make prod RUN python setup.py install && \ chown -R snappass $APP_DIR && \ chgrp -R snappass $APP_DIR From b96b4f9442138e7a342b469d5d7472bda4040620 Mon Sep 17 00:00:00 2001 From: Baraa Al-Masri Date: Tue, 6 Feb 2024 17:14:56 +0300 Subject: [PATCH 3/4] chore: update requirements.txt --- requirements.txt | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/requirements.txt b/requirements.txt index 509d0ef3..293aab6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,37 +1,7 @@ -async-timeout==4.0.3 -attrs==23.2.0 -cffi==1.16.0 -click==8.1.7 -coverage==6.4.1 cryptography==38.0.4 -Deprecated==1.2.14 -distlib==0.3.8 -fakeredis==1.7.5 -filelock==3.13.1 -flake8==6.0.0 Flask==2.1.2 -freezegun==1.2.1 -iniconfig==2.0.0 itsdangerous==2.1.2 Jinja2==3.1.2 MarkupSafe==2.1.1 -mccabe==0.7.0 -packaging==23.2 -platformdirs==4.2.0 -pluggy==1.4.0 -py==1.11.0 -pycodestyle==2.10.0 -pycparser==2.21 -pyflakes==3.0.1 -pytest==7.1.2 -pytest-cov==3.0.0 -python-dateutil==2.8.2 redis==4.3.3 -six==1.16.0 -sortedcontainers==2.4.0 -toml==0.10.2 -tomli==2.0.1 -tox==3.25.0 -virtualenv==20.25.0 Werkzeug==2.1.2 -wrapt==1.16.0 From 2d27f4dd2aab048127502f510fe0577ddc716531 Mon Sep 17 00:00:00 2001 From: Baraa Al-Masri Date: Tue, 6 Feb 2024 17:19:47 +0300 Subject: [PATCH 4/4] chore: and commands something --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4cc281c..acd500e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,10 +12,9 @@ COPY ["setup.py", "MANIFEST.in", "README.rst", "AUTHORS.rst", "Makefile", "requi COPY ["./snappass", "$APP_DIR/snappass"] RUN apt-get update && \ - apt-get install make - -RUN make prod -RUN python setup.py install && \ + apt-get install make && \ + make prod && \ + python setup.py install && \ chown -R snappass $APP_DIR && \ chgrp -R snappass $APP_DIR