diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2022-12-09 11:23:25 -0800 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2023-01-10 09:11:13 -0800 |
| commit | 939a7c0394edfa6b2ea384fdc76a95f4d6116152 (patch) | |
| tree | d6cefe4396976fb2a562c029b7a9372869be314c | |
| parent | c3395915a93ea090c4a8980b5eecdaeffa8b518d (diff) | |
| download | zuul-939a7c0394edfa6b2ea384fdc76a95f4d6116152.tar.gz | |
Update openshift client install version
This updates the openshift client install to use the latest stable
release. Hashes of the oc and kubectl command remain the same which
should continue to allow us to avoid copying both files.
Note we don't fetch the client from the stable-4.11/ path because the
versions of the client under this path are updated when the stable
version updates. Instad we fetch it from the permanent location for the
current stable release (4.11.20/).
Change-Id: Ie78ecd9108f8d6d100479910aa524f867020774f
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 57243a101..5c10fe269 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,8 @@ ARG REACT_APP_ZUUL_API # Optional flag to enable React Service Worker. (set to true to enable) ARG REACT_APP_ENABLE_SERVICE_WORKER # Kubectl/Openshift version/sha -ARG OPENSHIFT_URL=https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz -ARG OPENSHIFT_SHA=4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990da3 +ARG OPENSHIFT_URL=https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/4.11.20/openshift-client-linux-4.11.20.tar.gz +ARG OPENSHIFT_SHA=74f252c812932425ca19636b2be168df8fe57b114af6b114283975e67d987d11 COPY . /tmp/src COPY --from=js-builder /tmp/src/build /tmp/src/zuul/web/static @@ -46,7 +46,7 @@ RUN /output/install-from-bindep \ && curl -L $OPENSHIFT_URL -o /tmp/openshift-install/openshift-client.tgz \ && cd /tmp/openshift-install/ \ && echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \ - && tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install + && tar xvfz openshift-client.tgz -C /tmp/openshift-install FROM docker.io/opendevorg/python-base:3.11-bullseye as zuul ENV DEBIAN_FRONTEND=noninteractive |