Align python requirments and make pip install as vscode user (#7)

* Align python requirments and make pip install as vscode user * Update versions * Update NOTICE-3RD... * Intermediate test for requirements handling * Intermediate test for requirements handling2 * correct requirements links * Update NOTICE-3RD-PARTY-CONTENT.md Fix license requirements
eclipse-velocitas · Dec 5, 2022 · 1dd721a · 1dd721a
1 parent 369be5e
commit 1dd721a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 360 deletions.
diff --git a/Dockerfiles/Python/Dockerfile b/Dockerfiles/Python/Dockerfile
@@ -31,7 +31,6 @@ RUN UID="4000" bash /tmp/scripts/install-common.sh
 ADD https://raw.githubusercontent.com/devcontainers/features/main/src/docker-in-docker/install.sh /tmp/scripts/install-dind.sh
 RUN VERSION="latest" bash /tmp/scripts/install-dind.sh
 
-COPY ./requirements/ /requirements/
 COPY ./scripts/ /scripts/
 
 WORKDIR /scripts
@@ -40,11 +39,18 @@ RUN ./install-dapr-cli.sh
 RUN ./install-k3d-prerequisites.sh
 USER 4000
 RUN ./install-k3d-tooling.sh
-USER root
 
-WORKDIR /requirements
+# Fetch requirements into requirements folder
+ADD --chown=4000 https://raw.githubusercontent.com/eclipse-velocitas/vehicle-app-python-template/main/requirements-dev.txt /requirements/
+ADD --chown=4000 https://raw.githubusercontent.com/eclipse-velocitas/vehicle-app-python-template/main/app/requirements-links.txt /requirements/
+ADD --chown=4000 https://raw.githubusercontent.com/eclipse-velocitas/vehicle-app-python-template/main/app/requirements-app.txt /requirements/
+ADD --chown=4000 https://raw.githubusercontent.com/eclipse-velocitas/vehicle-app-python-template/main/app/tests/requirements-tests.txt /requirements/
 
+WORKDIR /requirements
+# Always install requirements under vscode user to avoid issue with installation of packages
 RUN pip3 install -r requirements-dev.txt
 RUN pip3 install -r requirements-links.txt
-RUN pip3 install -r requirements.txt
-RUN pip3 install -r requirements-test.txt
+RUN pip3 install -r requirements-app.txt
+RUN pip3 install -r requirements-tests.txt
+# Keep root as last user
+USER root
diff --git a/Dockerfiles/Python/requirements/requirements-dev.txt b/Dockerfiles/Python/requirements/requirements-dev.txt
diff --git a/Dockerfiles/Python/requirements/requirements-links.txt b/Dockerfiles/Python/requirements/requirements-links.txt
diff --git a/Dockerfiles/Python/requirements/requirements-test.txt b/Dockerfiles/Python/requirements/requirements-test.txt
diff --git a/Dockerfiles/Python/requirements/requirements.txt b/Dockerfiles/Python/requirements/requirements.txt
diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
@@ -1,86 +1,5 @@
 # Licenses Notice
 *Note*: This file is auto-generated. Do not modify it manually.
-## Python
-| Dependency | Version | License |
-|:-----------|:-------:|--------:|
-|aiohttp|3.8.3|Apache 2.0|
-|aiosignal|1.2.0|Apache 2.0|
-|astroid|2.12.11|GNU Lesser General Public License v2 (LGPLv2)|
-|async-timeout|4.0.2|Apache 2.0|
-|attrs|22.1.0|MIT|
-|bandit|1.7.4|Apache 2.0|
-|black|22.10.0|MIT|
-|build|0.8.0|MIT|
-|cfgv|3.3.1|MIT|
-|charset-normalizer|2.1.1|MIT|
-|click|8.1.3|New BSD|
-|cloudevents|1.6.1|Apache 2.0|
-|coverage|6.5.0|Apache 2.0|
-|coverage2clover|3.3.0|THE BEERWARE LICENSE|
-|coveragepy-lcov|0.1.2|Apache 2.0|
-|dapr|1.7.0|Apache 2.0|
-|deprecation|2.1.0|Apache 2.0|
-|dill|0.3.5.1|New BSD|
-|distlib|0.3.6|Python Software Foundation License|
-|filelock|3.8.0|Public Domain|
-|flake8|5.0.4|MIT|
-|frozenlist|1.3.1|Apache 2.0|
-|gitdb|4.0.9|BSD|
-|GitPython|3.1.29|BSD|
-|grpc-stubs|1.24.11|MIT|
-|grpcio|1.49.1|Apache 2.0|
-|grpcio-tools|1.48.2|Apache 2.0|
-|identify|2.5.6|MIT|
-|idna|3.4|BSD|
-|iniconfig|1.1.1|MIT|
-|isort|5.10.1|MIT|
-|lazy-object-proxy|1.7.1|Simplified BSD|
-|mccabe|0.7.0|MIT|
-|multidict|6.0.2|Apache 2.0|
-|mypy|0.982|MIT|
-|mypy-extensions|0.4.3|MIT|
-|mypy-protobuf|3.3.0|Apache 2.0|
-|nodeenv|1.7.0|BSD|
-|packaging|21.3|Apache 2.0<br/>Simplified BSD|
-|pathspec|0.10.1|Mozilla Public License 2.0 (MPL 2.0)|
-|pbr|5.10.0|Apache 2.0|
-|pep517|0.13.0|MIT|
-|pip|22.0.4|MIT|
-|pip-tools|6.9.0|BSD|
-|platformdirs|2.5.2|MIT|
-|pluggy|1.0.0|MIT|
-|pre-commit|2.20.0|MIT|
-|protobuf|3.20.1|Google License|
-|py|1.11.0|MIT|
-|pycodestyle|2.9.1|MIT|
-|pydocstyle|6.1.1|MIT|
-|pyflakes|2.5.0|MIT|
-|Pygments|2.13.0|BSD|
-|pygount|1.2.4|BSD|
-|pylint|2.15.4|GNU General Public License v2 (GPLv2)|
-|pyparsing|3.0.9|MIT|
-|pytest|7.1.3|MIT|
-|pytest-asyncio|0.19.0|Apache 2.0|
-|pytest-cov|4.0.0|MIT|
-|pytest-ordering|0.6|MIT|
-|python-dateutil|2.8.2|Apache 2.0<br/>BSD|
-|PyYAML|6.0|MIT|
-|setuptools|58.1.0|MIT|
-|six|1.16.0|MIT|
-|smmap|5.0.0|BSD|
-|snowballstemmer|2.2.0|New BSD|
-|stevedore|4.0.0|Apache 2.0|
-|toml|0.10.2|MIT|
-|tomli|2.0.1|MIT|
-|tomlkit|0.11.5|MIT|
-|tox|3.26.0|MIT|
-|types-mock|4.0.15|Apache 2.0|
-|types-protobuf|3.20.4|Apache 2.0|
-|typing-extensions|4.4.0|Python Software Foundation License|
-|virtualenv|20.16.5|MIT|
-|wheel|0.37.1|MIT|
-|wrapt|1.14.1|BSD|
-|yarl|1.8.1|Apache 2.0|
 ## Workflows
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|