From 203c3bc6b4a98177f15ae90a7be0043380d60a81 Mon Sep 17 00:00:00 2001 From: RTann Date: Thu, 14 Nov 2024 15:27:30 -0800 Subject: [PATCH] chore: update misc dependencies --- images/scanner-build.Dockerfile | 5 +++-- images/scanner-test.Dockerfile | 16 ++++++++-------- images/stackrox-build.Dockerfile | 7 +++++-- images/stackrox-test.Dockerfile | 30 +++++++++++++++--------------- images/stackrox-ui-test.Dockerfile | 30 +++++++++++++++--------------- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile index 07cfdf1b..a2ff3639 100644 --- a/images/scanner-build.Dockerfile +++ b/images/scanner-build.Dockerfile @@ -35,6 +35,7 @@ RUN dnf update -y && \ dnf clean all && \ rm -rf /var/cache/dnf /var/cache/yum +# Install Go v1.22.5 ARG GOLANG_VERSION=1.22.5 ARG GOLANG_SHA256=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 ENV GOPATH /go @@ -47,14 +48,14 @@ RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ chmod -R 777 "$GOPATH" -# fetch +# Install fetch v0.4.6 ARG FETCH_VERSION=0.4.6 ARG FETCH_SHA256=a67ed3141d6deb7e7841f40505cba11eb7a37abbab78374712a42373e7854209 RUN wget --no-verbose -O fetch https://github.com/gruntwork-io/fetch/releases/download/v${FETCH_VERSION}/fetch_linux_amd64 && \ echo "${FETCH_SHA256} fetch" | sha256sum -c - && \ install fetch /usr/bin -# ossls +# Install ossls 0.11.1 ARG OSSLS_VERSION=0.11.1 ARG OSSLS_SHA256=f1bf3012961c1d90ba307a46263f29025028d35c209b9a65e5c7d502c470c95f RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --release-asset="ossls_linux_amd64" . && \ diff --git a/images/scanner-test.Dockerfile b/images/scanner-test.Dockerfile index 1a7c6e30..201a751e 100644 --- a/images/scanner-test.Dockerfile +++ b/images/scanner-test.Dockerfile @@ -63,8 +63,8 @@ RUN dnf update -y \ ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True RUN gke-gcloud-auth-plugin --version -# Install docker 25.0.3 -ARG DOCKER_VERSION=25.0.3 +# Install docker 27.3.1 +ARG DOCKER_VERSION=27.3.1 RUN set -ex \ && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \ && echo Docker URL: $DOCKER_URL \ @@ -85,22 +85,22 @@ RUN set -ex \ && rm -rf "oc-dir" oc.tgz \ && command -v oc -# Install helm v3.14.2 +# Install helm v3.16.2 RUN set -ex \ - && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz \ + && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.16.2-linux-amd64.tar.gz \ && tar -xf helm.tgz \ && install linux-amd64/helm /usr/local/bin \ && rm -rf helm.tgz linux-amd64 \ && command -v helm -# Install yq v4.42.1 +# Install yq v4.44.3 RUN set -ex \ - && wget --no-verbose https://github.com/mikefarah/yq/releases/download/v4.42.1/yq_linux_amd64 \ - && sha256sum --check --status <<< "1a95960dddd426321354d58d2beac457717f7c49a9ec0806749a5a9e400eb45e yq_linux_amd64" \ + && wget --no-verbose https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64 \ + && sha256sum --check --status <<< "7d518dba109935819c938be9269ff9413bd1b7546c157289eb0fdf82e49616f7 yq_linux_amd64" \ && install yq_linux_amd64 /usr/bin/yq \ && command -v yq -# Install hub-comment +# Install hub-comment 0.1.0-rc6 RUN set -ex \ && wget --no-verbose https://github.com/joshdk/hub-comment/releases/download/0.1.0-rc6/hub-comment_linux_amd64 \ && sha256sum --check --status <<< "2a2640f44737873dfe30da0d5b8453419d48a494f277a70fd9108e4204fc4a53 hub-comment_linux_amd64" \ diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile index c829dc4d..f2ec89d3 100644 --- a/images/stackrox-build.Dockerfile +++ b/images/stackrox-build.Dockerfile @@ -55,6 +55,7 @@ RUN dnf update -y && \ dnf clean all && \ rm -rf /var/cache/dnf /var/cache/yum +# Install Go v1.22.5 ARG GOLANG_VERSION=1.22.5 ARG GOLANG_SHA256=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 ENV GOPATH /go @@ -67,13 +68,15 @@ RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ chmod -R 777 "$GOPATH" -ARG FETCH_VERSION=0.3.5 -ARG FETCH_SHA256=8d4d99e903b30dbd24290e9a056a982ea2326a05ded24c63be64df16e7e0d9f0 +# Install fetch v0.4.6 +ARG FETCH_VERSION=0.4.6 +ARG FETCH_SHA256=a67ed3141d6deb7e7841f40505cba11eb7a37abbab78374712a42373e7854209 RUN wget --no-verbose -O fetch https://github.com/gruntwork-io/fetch/releases/download/v${FETCH_VERSION}/fetch_linux_amd64 && \ echo "${FETCH_SHA256} fetch" | sha256sum -c - && \ install fetch /usr/bin && \ rm fetch +# Install ossls 0.11.1 ARG OSSLS_VERSION=0.11.1 ARG OSSLS_SHA256=f1bf3012961c1d90ba307a46263f29025028d35c209b9a65e5c7d502c470c95f RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --release-asset="ossls_linux_amd64" . && \ diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index ea18effd..12400786 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -58,11 +58,11 @@ ENV PATH=$PATH:/usr/pgsql-14/bin # Install bats RUN set -ex \ - && npm install -g bats@1.10.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \ + && npm install -g bats@1.11.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \ && bats -v -# Install docker binary -ARG DOCKER_VERSION=20.10.6 +# Install docker 27.3.1 +ARG DOCKER_VERSION=27.3.1 RUN set -ex \ && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \ && echo Docker URL: $DOCKER_URL \ @@ -77,24 +77,24 @@ RUN set -ex \ # Symlink python to python3 RUN ln -s /usr/bin/python3 /usr/bin/python -# oc +# Install oc 4.15.0-0.okd-2024-02-23-163410 RUN set -ex \ - && wget --no-verbose -O oc.tgz https://github.com/okd-project/okd/releases/download/4.11.0-0.okd-2022-12-02-145640/openshift-client-linux-4.11.0-0.okd-2022-12-02-145640.tar.gz \ + && wget --no-verbose -O oc.tgz https://github.com/okd-project/okd/releases/download/4.15.0-0.okd-2024-02-23-163410/openshift-client-linux-4.15.0-0.okd-2024-02-23-163410.tar.gz \ && mkdir "oc-dir" \ && tar -C "oc-dir" -xf oc.tgz \ && install oc-dir/oc /usr/local/bin \ && rm -rf "oc-dir" oc.tgz \ && command -v oc -# helm +# Install helm v3.16.2 RUN set -ex \ - && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.11.2-linux-amd64.tar.gz \ + && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.16.2-linux-amd64.tar.gz \ && tar -xf helm.tgz \ && install linux-amd64/helm /usr/local/bin \ && rm -rf helm.tgz linux-amd64 \ && command -v helm -# Install gradle +# Install gradle 7.5.1 ARG GRADLE_VERSION=7.5.1 ENV PATH=$PATH:/opt/gradle/bin RUN set -ex \ @@ -106,7 +106,7 @@ RUN set -ex \ && rmdir gradle-${GRADLE_VERSION} \ && command -v gradle -# Install aws cli +# Install aws cli 2.7.17 RUN set -ex \ && wget --no-verbose -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.17.zip" \ && unzip awscliv2.zip \ @@ -115,21 +115,21 @@ RUN set -ex \ && rm -rf aws \ && aws --version -# Install yq v4.16.2 +# Install yq v4.44.3 RUN set -ex \ - && wget --no-verbose "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" \ - && sha256sum --check --status <<< "5c911c4da418ae64af5527b7ee36e77effb85de20c2ce732ed14c7f72743084d yq_linux_amd64" \ + && wget --no-verbose "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64" \ + && sha256sum --check --status <<< "7d518dba109935819c938be9269ff9413bd1b7546c157289eb0fdf82e49616f7 yq_linux_amd64" \ && mv yq_linux_amd64 /usr/bin/yq \ && chmod +x /usr/bin/yq -# Install hub-comment +# Install hub-comment 0.1.0-rc6 RUN set -ex \ && wget --quiet https://github.com/joshdk/hub-comment/releases/download/0.1.0-rc6/hub-comment_linux_amd64 \ && sha256sum --check --status <<< "2a2640f44737873dfe30da0d5b8453419d48a494f277a70fd9108e4204fc4a53 hub-comment_linux_amd64" \ && mv hub-comment_linux_amd64 /usr/bin/hub-comment \ && chmod +x /usr/bin/hub-comment -# Install shellcheck +# Install shellcheck 0.10.0 ARG SHELLCHECK_VERSION=0.10.0 ARG SHELLCHECK_SHA256=6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87 RUN set -ex \ @@ -141,7 +141,7 @@ RUN set -ex \ && rm -rf "shellcheck-v${SHELLCHECK_VERSION}" \ && shellcheck --version -# Install hashicorp vault +# Install hashicorp vault 1.12.1 ARG VAULT_VERSION=1.12.1 ARG VAULT_SHA256=839fa81eacd250e0b0298e518751a792cd5d7194650af78cf5da74d7b7b1e5fb RUN set -ex \ diff --git a/images/stackrox-ui-test.Dockerfile b/images/stackrox-ui-test.Dockerfile index 7cd4b34f..f383fff2 100644 --- a/images/stackrox-ui-test.Dockerfile +++ b/images/stackrox-ui-test.Dockerfile @@ -109,11 +109,11 @@ ENV PATH=$PATH:/usr/pgsql-14/bin # Install bats RUN set -ex \ - && npm install -g bats@1.10.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \ + && npm install -g bats@1.11.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \ && bats -v -# Install docker binary -ARG DOCKER_VERSION=20.10.6 +# Install docker 27.3.1 +ARG DOCKER_VERSION=27.3.1 RUN set -ex \ && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \ && echo Docker URL: $DOCKER_URL \ @@ -128,24 +128,24 @@ RUN set -ex \ # Symlink python to python3 RUN ln -s /usr/bin/python3 /usr/bin/python -# oc +# Install oc 4.15.0-0.okd-2024-02-23-163410 RUN set -ex \ - && wget --no-verbose -O oc.tgz https://github.com/okd-project/okd/releases/download/4.11.0-0.okd-2022-12-02-145640/openshift-client-linux-4.11.0-0.okd-2022-12-02-145640.tar.gz \ + && wget --no-verbose -O oc.tgz https://github.com/okd-project/okd/releases/download/4.15.0-0.okd-2024-02-23-163410/openshift-client-linux-4.15.0-0.okd-2024-02-23-163410.tar.gz \ && mkdir "oc-dir" \ && tar -C "oc-dir" -xf oc.tgz \ && install oc-dir/oc /usr/local/bin \ && rm -rf "oc-dir" oc.tgz \ && command -v oc -# helm +# Install helm v3.16.2 RUN set -ex \ - && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.11.2-linux-amd64.tar.gz \ + && wget --no-verbose -O helm.tgz https://get.helm.sh/helm-v3.16.2-linux-amd64.tar.gz \ && tar -xf helm.tgz \ && install linux-amd64/helm /usr/local/bin \ && rm -rf helm.tgz linux-amd64 \ && command -v helm -# Install gradle +# Install gradle 7.5.1 ARG GRADLE_VERSION=7.5.1 ENV PATH=$PATH:/opt/gradle/bin RUN set -ex \ @@ -157,7 +157,7 @@ RUN set -ex \ && rmdir gradle-${GRADLE_VERSION} \ && command -v gradle -# Install aws cli +# Install aws cli 2.7.17 RUN set -ex \ && wget --no-verbose -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.17.zip" \ && unzip awscliv2.zip \ @@ -166,21 +166,21 @@ RUN set -ex \ && rm -rf aws \ && aws --version -# Install yq v4.16.2 +# Install yq v4.44.3 RUN set -ex \ - && wget --no-verbose "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" \ - && sha256sum --check --status <<< "5c911c4da418ae64af5527b7ee36e77effb85de20c2ce732ed14c7f72743084d yq_linux_amd64" \ + && wget --no-verbose "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64" \ + && sha256sum --check --status <<< "7d518dba109935819c938be9269ff9413bd1b7546c157289eb0fdf82e49616f7 yq_linux_amd64" \ && mv yq_linux_amd64 /usr/bin/yq \ && chmod +x /usr/bin/yq -# Install hub-comment +# Install hub-comment 0.1.0-rc6 RUN set -ex \ && wget --quiet https://github.com/joshdk/hub-comment/releases/download/0.1.0-rc6/hub-comment_linux_amd64 \ && sha256sum --check --status <<< "2a2640f44737873dfe30da0d5b8453419d48a494f277a70fd9108e4204fc4a53 hub-comment_linux_amd64" \ && mv hub-comment_linux_amd64 /usr/bin/hub-comment \ && chmod +x /usr/bin/hub-comment -# Install shellcheck +# Install shellcheck 0.10.0 ARG SHELLCHECK_VERSION=0.10.0 ARG SHELLCHECK_SHA256=6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87 RUN set -ex \ @@ -192,7 +192,7 @@ RUN set -ex \ && rm -rf "shellcheck-v${SHELLCHECK_VERSION}" \ && shellcheck --version -# Install hashicorp vault +# Install hashicorp vault 1.12.1 ARG VAULT_VERSION=1.12.1 ARG VAULT_SHA256=839fa81eacd250e0b0298e518751a792cd5d7194650af78cf5da74d7b7b1e5fb RUN set -ex \