UNCLASSIFIED

Commit 4e4c35c3 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

master: fix pip

See merge request !45
parents 682e6636 6981ba5d
Pipeline #369914 passed with stages
in 22 minutes and 7 seconds
...@@ -40,13 +40,8 @@ RUN find /usr/local -depth \ ...@@ -40,13 +40,8 @@ RUN find /usr/local -depth \
echo '/usr/local/lib' > /etc/ld.so.conf && \ echo '/usr/local/lib' > /etc/ld.so.conf && \
ldconfig ldconfig
COPY pip-21.1.3-py3-none-any.whl / COPY *.whl /wheel/
COPY setuptools-56.1.0-py3-none-any.whl / RUN pip3.9 install --no-index --upgrade --find-links=/wheel/ pip setuptools wheel
COPY wheel-0.36.2-py2.py3-none-any.whl /
RUN python3.9 -m pip install --no-index --upgrade /pip-21.1.3-py3-none-any.whl && \
python3.9 -m pip install --no-index --upgrade /setuptools-56.1.0-py3-none-any.whl && \
python3.9 -m pip install --no-index --upgrade /wheel-0.36.2-py2.py3-none-any.whl
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -73,6 +68,8 @@ RUN cd /usr/local/bin && \ ...@@ -73,6 +68,8 @@ RUN cd /usr/local/bin && \
ln -s easy_install-3 easy_install && \ ln -s easy_install-3 easy_install && \
ln -s 2to3-3.9 2to3-3 && \ ln -s 2to3-3.9 2to3-3 && \
ln -s 2to3-3 2to3 && \ ln -s 2to3-3 2to3 && \
ln -s pip3.9 pip3 && \
ln -s pip3 pip && \
echo '/usr/local/lib' > /etc/ld.so.conf && \ echo '/usr/local/lib' > /etc/ld.so.conf && \
ldconfig ldconfig
......
...@@ -41,7 +41,7 @@ resources: ...@@ -41,7 +41,7 @@ resources:
validation: validation:
type: sha256 type: sha256
value: 78cb760711fedc073246543801c84dc5377affead832e103ad0211f99303a204 value: 78cb760711fedc073246543801c84dc5377affead832e103ad0211f99303a204
- filename: setuptools-56.1.0-py3-none-any.whl - filename: setuptools-57.1.0-py3-none-any.whl
url: https://files.pythonhosted.org/packages/a2/e1/902fbc2f61ad6243cd3d57ffa195a9eb123021ec912ec5d811acf54a39f8/setuptools-57.1.0-py3-none-any.whl url: https://files.pythonhosted.org/packages/a2/e1/902fbc2f61ad6243cd3d57ffa195a9eb123021ec912ec5d811acf54a39f8/setuptools-57.1.0-py3-none-any.whl
validation: validation:
type: sha256 type: sha256
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment