Skip to content

[release-4.11] OCPBUGS-1876: download 'aliyun' #6377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 8, 2022
Merged

[release-4.11] OCPBUGS-1876: download 'aliyun' #6377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions images/installer/Dockerfile.upi.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ RUN echo "${YQ_HASH} -" > /tmp/sum.txt && \
chmod +x /bin/yq-go && \
rm /tmp/sum.txt

ARG ALIYUN_URI=https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz
RUN curl -sSL "${ALIYUN_URI}" --output /tmp/aliyun-cli-linux-latest-amd64.tgz && \
tar --directory=/bin/ -xvf /tmp/aliyun-cli-linux-latest-amd64.tgz && \
rm -f /tmp/aliyun-cli-linux-latest-amd64.tgz

RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
RUN python get-pip.py 'pip<21.0'
RUN python -m pip install pyopenssl
Expand Down
5 changes: 5 additions & 0 deletions images/installer/Dockerfile.upi.ci.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ RUN echo "${YQ_HASH} -" > /tmp/sum.txt && \
chmod +x /bin/yq-go && \
rm /tmp/sum.txt

ARG ALIYUN_URI=https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz
RUN curl -sSL "${ALIYUN_URI}" --output /tmp/aliyun-cli-linux-latest-amd64.tgz && \
tar --directory=/bin/ -xvf /tmp/aliyun-cli-linux-latest-amd64.tgz && \
rm -f /tmp/aliyun-cli-linux-latest-amd64.tgz

# Not packaged for Python 2, but required by gcloud. See https://cloud.google.com/sdk/crypto
RUN pip-2 install pyopenssl
ENV CLOUDSDK_PYTHON=/usr/bin/python
Expand Down