Skip to content

Commit 4063a13

Browse files
Merge pull request openshift#8216 from r4f4/upi-image-cleanup
no-jira: images: upi-installer image cleanup
2 parents 7510cc0 + 6e7be07 commit 4063a13

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

images/installer/Dockerfile.upi.ci

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,13 @@ RUN yum update -y && \
6060
COPY --from=yq3 /yq /bin/yq-go
6161
COPY --from=yq4 /usr/bin/yq /bin/yq-v4
6262

63-
ARG ALIYUN_URI=https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz
64-
RUN curl -sSL "${ALIYUN_URI}" --output /tmp/aliyun-cli-linux-latest-amd64.tgz && \
65-
tar --directory=/bin/ -xvf /tmp/aliyun-cli-linux-latest-amd64.tgz && \
66-
rm -f /tmp/aliyun-cli-linux-latest-amd64.tgz
67-
6863
# Not packaged, but required by gcloud. See https://cloud.google.com/sdk/crypto
6964
# Pin version because of https://github.com/GoogleCloudPlatform/gsutil/issues/1753
7065
RUN pip-3 install cryptography pyOpenSSL==23.2.0
7166

7267
ENV CLOUDSDK_PYTHON=/usr/bin/python
7368
ENV CLOUDSDK_PYTHON_SITEPACKAGES=1
7469

75-
ENV TERRAFORM_VERSION=1.0.11
76-
RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
77-
unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /bin/
78-
ENV MATCHBOX_PROVIDER_VERSION=0.5.0
79-
RUN curl -L -O https://github.com/poseidon/terraform-provider-matchbox/releases/download/v${MATCHBOX_PROVIDER_VERSION}/terraform-provider-matchbox_${MATCHBOX_PROVIDER_VERSION}_linux_amd64.zip && \
80-
unzip terraform-provider-matchbox_${MATCHBOX_PROVIDER_VERSION}_linux_amd64.zip -d /bin/ && \
81-
mv /bin/terraform-provider-matchbox_v${MATCHBOX_PROVIDER_VERSION} /bin/terraform-provider-matchbox
82-
ENV IGNITION_PROVIDER_VERSION=v2.1.0
83-
RUN curl -L -O https://github.com/community-terraform-providers/terraform-provider-ignition/releases/download/${IGNITION_PROVIDER_VERSION}/terraform-provider-ignition-${IGNITION_PROVIDER_VERSION}-linux-amd64.tar.gz && \
84-
tar xzf terraform-provider-ignition-${IGNITION_PROVIDER_VERSION}-linux-amd64.tar.gz && \
85-
mv terraform-provider-ignition-${IGNITION_PROVIDER_VERSION}-linux-amd64/terraform-provider-ignition /bin/terraform-provider-ignition
8670
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
8771
unzip awscliv2.zip && \
8872
./aws/install -b /bin && \

0 commit comments

Comments
 (0)