3.19

Ouest-France · Feb 5, 2024 · aa20199 · aa20199
1 parent 4c9d1f6
commit aa20199
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,16 +21,16 @@ RUN apk -v --no-cache add tar ca-certificates python3  python3-dev  skopeo coreu
     && if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi \
     && if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi \
     && ln -s /usr/lib/libcurl.so.4 /usr/lib/libcurl-gnutls.so.4 \
-    && pip install awscli --break-system-packages \
+    && pip install awscli build --break-system-packages \
     && pip install --break-system-packages -r requirements.txt \
     && apk -v add gettext \
     && apk -v --no-cache --purge del py-pip autoconf automake libtool build-base libgit2-dev python3-dev \
-    && curl -L https://get.helm.sh/helm-${VERSION_HELM}-linux-amd64.tar.gz | tar zxv -C /tmp/ --strip-components=1 linux-amd64/helm && mv /tmp/helm /bin/helm3 && chmod +x /bin/helm3 \
-    && curl -L https://get.helm.sh/helm-${VERSION_HELM2}-linux-amd64.tar.gz | tar zxv -C /tmp/ --strip-components=1 linux-amd64/helm && mv /tmp/helm /bin/helm2 && chmod +x /bin/helm2 \
+    && curl -sL https://get.helm.sh/helm-${VERSION_HELM}-linux-amd64.tar.gz | tar zxv -C /tmp/ --strip-components=1 linux-amd64/helm && mv /tmp/helm /bin/helm3 && chmod +x /bin/helm3 \
+    && curl -sL https://get.helm.sh/helm-${VERSION_HELM2}-linux-amd64.tar.gz | tar zxv -C /tmp/ --strip-components=1 linux-amd64/helm && mv /tmp/helm /bin/helm2 && chmod +x /bin/helm2 \
     && helm3 plugin install https://github.com/helm/helm-2to3 \
     && rm -rf /var/lib/apk/lists/* && rm -rf /var/cache/apk/* /root/.cache /usr/lib/python3.8/site-packages/pip /usr/lib/python3.8/__pycache__ /usr/lib/python3.8/site-packages/awscli/examples /usr/lib/python3.8/site-packages/config-3.8* \
     && mkdir -p /root/.docker && iptables-legacy-save
-RUN  python setup.py install && rm -rf /cdp/..?* .[!.]*
+RUN  python -m build -n -x && rm -rf /cdp/..?* .[!.]*
 
 
 # Options Podman

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def find_version(*file_paths):
     setup_requires=['pytest-runner'],
     tests_require=['pytest', 'freezegun'],
     license='Apache License 2.0',
-    classifiers=(
+    classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
@@ -70,7 +70,7 @@ def find_version(*file_paths):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-    ),
+    ],
 )
 
 setup(**setup_options)