Skip to content

Commit

Permalink
Merge branch 'main' into kcrane_multiarch
Browse files Browse the repository at this point in the history
  • Loading branch information
kcrane authored Nov 15, 2023
2 parents 0a6a3ca + 240e498 commit 4c2d9f1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions images/collector.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
# Install pip
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py

ARG GOLANG_VERSION=1.20.4
ARG GOLANG_SHA256=698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd
ARG GOLANG_VERSION=1.20.10
ARG GOLANG_SHA256=80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
Expand Down
8 changes: 4 additions & 4 deletions images/scanner-build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ RUN dnf update -y && \
dnf clean all && \
rm -rf /var/cache/dnf /var/cache/yum

ARG GOLANG_VERSION=1.20.4
ARG GOLANG_SHA256_x86_64=698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd
ARG GOLANG_SHA256_s390x=57f999a4e605b1dfa4e7e58c7dbae47d370ea240879edba8001ab33c9a963ebf
ARG GOLANG_SHA256_ppc64le=8c6f44b96c2719c90eebabe2dd866f9c39538648f7897a212cac448587e9a408
ARG GOLANG_VERSION=1.20.10
ARG GOLANG_SHA256_x86_64=80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248
ARG GOLANG_SHA256_s390x=fa32588cbdd1e8adfd7e9f1b4ba3f7a8b424f60e90bf2cc4716650374eb459ae
ARG GOLANG_SHA256_ppc64le=ebac6e713810174f9ffd7f48c17c373fbf359d50d8e6233b1dfbbdebd524fd1c
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
RUN GOLANG_SHA256="GOLANG_SHA256_$(uname -m)" && \
Expand Down
4 changes: 2 additions & 2 deletions images/stackrox-build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ RUN dnf update -y && \
dnf clean all && \
rm -rf /var/cache/dnf /var/cache/yum

ARG GOLANG_VERSION=1.20.4
ARG GOLANG_SHA256=698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd
ARG GOLANG_VERSION=1.20.10
ARG GOLANG_SHA256=80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
Expand Down

0 comments on commit 4c2d9f1

Please sign in to comment.