Skip to content

Commit fdbcefc

Browse files
committed
Update files to build with Go 1.26
1 parent 61e5e4f commit fdbcefc

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM --platform=linux/x86_64 ubuntu:24.04
1+
FROM --platform=linux/x86_64 ubuntu:24.04@sha256:c4a8d5503dfb2a3eb8ab5f807da5bc69a85730fb49b5cfca2330194ebcc41c7b
22

33
RUN apt update && apt install -y curl tar make bash git build-essential
44

55
# Install Go
66
WORKDIR /root
77

8-
RUN curl -LO https://go.dev/dl/go1.24.10.linux-amd64.tar.gz && tar -C /tmp -xzf go1.24.10.linux-amd64.tar.gz && rm -f /root/go1.24.10.linux-amd64.tar.gz && mv /tmp/go go1.24
8+
RUN echo "00859d7bd6defe8bf84d9db9e57b9a4467b2887c18cd93ae7460e713db774bc1 go1.25.9.linux-amd64.tar.gz" > SHA256SUMS && curl -LO https://go.dev/dl/go1.25.9.linux-amd64.tar.gz && sha256sum -c SHA256SUMS && tar -C /tmp -xzf go1.25.9.linux-amd64.tar.gz && rm -f /root/go1.25.9.linux-amd64.tar.gz && mv /tmp/go go1.25
99

1010
WORKDIR /root/go/src/go.googlesource.com/go
1111

12-
RUN git clone https://go.googlesource.com/go goroot && cd goroot && git checkout release-branch.go1.25 && cd src && export GOROOT_BOOTSTRAP=/root/go1.24 && ./all.bash
12+
RUN git clone https://go.googlesource.com/go goroot && cd goroot && git checkout release-branch.go1.26 && cd src && export GOROOT_BOOTSTRAP=/root/go1.25 && ./all.bash
1313

1414
RUN cp -pr /root/go/src/go.googlesource.com/go/goroot /usr/local/go
1515

@@ -18,9 +18,8 @@ RUN /usr/local/go/bin/go version
1818
# Install Goss
1919
WORKDIR /root/go/src/github.com/goss-org
2020

21-
ARG GOSS_VERSION="0.4.9"
2221
ARG GOSS_COMMIT_HASH="5704120d25902119cb1139e04bca3db7742a9f73"
2322

2423
RUN curl -L https://github.com/goss-org/goss/archive/${GOSS_COMMIT_HASH}.tar.gz | tar -xzvf -
2524

26-
RUN mv goss-${GOSS_COMMIT_HASH} goss && cd goss && PATH=$PATH:/usr/local/go/bin TRAVIS_TAG=${GOSS_VERSION} make build
25+
RUN mv "goss-${GOSS_COMMIT_HASH}" goss && cd goss && PATH=$PATH:/usr/local/go/bin TRAVIS_TAG=0.4.9 make build

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/emic/fmcsadmin
22

3-
go 1.25.0
3+
go 1.26.0
44

5-
toolchain go1.25.6
5+
toolchain go1.26.2
66

77
require (
88
github.com/golang-jwt/jwt/v5 v5.3.1

release-notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fmcsadmin
33
This software is distributed under the Apache License, Version 2.0, see LICENSE.txt and NOTICE.txt for more information.
44

55
Version: 2.4.1-dev (in development)
6-
-
6+
- Built with Go 1.26.
77

88
Version: 2.4.0
99
Date: February 5, 2026

0 commit comments

Comments
 (0)