Skip to content

Commit

Permalink
Update Dockerfile and go.yml for GitHub Actions to use Goss v0.4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
matsuo committed Sep 26, 2024
1 parent 1d56033 commit 5604660
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 cp -pr /root/go1.22 /usr/local/go
RUN cp -pr /root/go/src/go.googlesource.com/go/goroot /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 -

Expand Down

0 comments on commit 5604660

Please sign in to comment.