diff options
| -rw-r--r-- | docker-files/alpine.Dockerfile | 13 | ||||
| -rw-r--r-- | glances/outputs/static/package-lock.json | 12 | ||||
| -rw-r--r-- | optional-requirements.txt | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile index 2b71b2ca..0c470839 100644 --- a/docker-files/alpine.Dockerfile +++ b/docker-files/alpine.Dockerfile @@ -29,8 +29,10 @@ RUN apk add --no-cache \ smartmontools \ iputils \ tzdata \ - # Required for 'cryptography' dependency - gcc libffi-dev openssl-dev cargo pkgconfig + # Required for 'cryptography' dependency of optional requirement 'cassandra-driver' \ + # Refer: https://cryptography.io/en/latest/installation/#alpine \ + # `git` required to clone cargo crates (dependencies) + gcc libffi-dev openssl-dev cargo pkgconfig git ############################################################################## # Install the dependencies beforehand to make them cacheable @@ -58,9 +60,14 @@ RUN pip3 install --no-cache-dir --user glances FROM build as buildOptionalRequirements ARG PYTHON_VERSION +# Required for optional dependency cassandra-driver +ENV CASS_DRIVER_NO_CYTHON=1 +# See issue 2368 +ENV CARGO_NET_GIT_FETCH_WITH_CLI=true + COPY requirements.txt . COPY optional-requirements.txt . -RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requirements.txt +RUN pip3 install --no-cache-dir --user -r optional-requirements.txt ############################################################################## # full image diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json index 9549ed8e..7a4a2dcf 100644 --- a/glances/outputs/static/package-lock.json +++ b/glances/outputs/static/package-lock.json @@ -2657,9 +2657,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.11.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.11.0.tgz", - "integrity": "sha512-bBCJAZnkBV7ATH4Z1E7CvN3nmtS4H7QUU3UBxPdo8WohRU+yHjnQRALpTbxMVcz0e4Mx3IyxIdP5HYODMxK9cQ==", + "version": "9.11.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.11.1.tgz", + "integrity": "sha512-SNtBGDrRkPUFsREswPceqdvZ7YVdWY+iCYiDC+RoxwVieeQ7GJU1FLDlkcaYTOD2os/YuVgI1Fdu8YGM7fmoow==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.3.0", @@ -10276,9 +10276,9 @@ } }, "eslint-plugin-vue": { - "version": "9.11.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.11.0.tgz", - "integrity": "sha512-bBCJAZnkBV7ATH4Z1E7CvN3nmtS4H7QUU3UBxPdo8WohRU+yHjnQRALpTbxMVcz0e4Mx3IyxIdP5HYODMxK9cQ==", + "version": "9.11.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.11.1.tgz", + "integrity": "sha512-SNtBGDrRkPUFsREswPceqdvZ7YVdWY+iCYiDC+RoxwVieeQ7GJU1FLDlkcaYTOD2os/YuVgI1Fdu8YGM7fmoow==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.3.0", diff --git a/optional-requirements.txt b/optional-requirements.txt index a331b53e..138f3ceb 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -4,7 +4,7 @@ batinfo bernhard bottle -#cassandra-driver # cassandra-driver breaks Glances CI (Alpine Docker). See detail in issue #2368 +cassandra-driver chevron couchdb docker==6.0.1 |