diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2ce0c54..02960bf 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -38,7 +38,7 @@ jobs: run: make build-linux-arm64 - shell: bash - run: echo "goss_commit_hash=aed56336c3e8ff683e9540065b502f423dd6760d" >> "$GITHUB_ENV" # v0.4.8 + run: echo "goss_commit_hash=5704120d25902119cb1139e04bca3db7742a9f73" >> "$GITHUB_ENV" # v0.4.9 - if: runner.os == 'macOS' || runner.os == 'Windows' shell: bash diff --git a/Dockerfile b/Dockerfile index 41c1398..b4c3d7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,19 +5,21 @@ RUN apt update && apt install -y curl tar make bash git build-essential # Install Go WORKDIR /root -RUN curl -LO https://go.dev/dl/go1.22.6.linux-amd64.tar.gz && tar -C /tmp -xzf go1.22.6.linux-amd64.tar.gz && rm -f /root/go1.22.6.linux-amd64.tar.gz && mv /tmp/go go1.22 +RUN curl -LO https://go.dev/dl/go1.22.7.linux-amd64.tar.gz && tar -C /tmp -xzf go1.22.7.linux-amd64.tar.gz && rm -f /root/go1.22.7.linux-amd64.tar.gz && mv /tmp/go go1.22 WORKDIR /root/go/src/go.googlesource.com/go -RUN git clone https://go.googlesource.com/go goroot && cd goroot && git checkout release-branch.go1.23 && cd src && export GOROOT_BOOTSTRAP=/root/go1.22 && ./all.bash +RUN git clone https://go.googlesource.com/go goroot && cd goroot && git checkout release-branch.go1.23 && cd src && export GOROOT_BOOTSTRAP=/root/go1.23 && ./all.bash -RUN cp -pr /root/go1.22 /usr/local/go +RUN cp -pr /root/go1.23 /usr/local/go + +RUN /usr/local/go/bin/go version # Install Goss WORKDIR /root/go/src/github.com/goss-org -ARG GOSS_VERSION="0.4.8" -ARG GOSS_COMMIT_HASH="aed56336c3e8ff683e9540065b502f423dd6760d" +ARG GOSS_VERSION="0.4.9" +ARG GOSS_COMMIT_HASH="5704120d25902119cb1139e04bca3db7742a9f73" RUN curl -L https://github.com/goss-org/goss/archive/${GOSS_COMMIT_HASH}.tar.gz | tar -xzvf -