Skip to content

Commit 99453bd

Browse files
mattlordmhamza15
andauthored
Docker: Fix mysql80 docker build (#19289)
Signed-off-by: Matt Lord <mattalord@gmail.com> Signed-off-by: Mohamed Hamza <mhamza@fastmail.com> Co-authored-by: Mohamed Hamza <mhamza@fastmail.com>
1 parent a307320 commit 99453bd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docker/lite/Dockerfile.mysql80

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=linux/amd64 golang:1.25.1-bookworm@sha256:299c4191248a84de928626d34afe734505ed7307ed67263b66ce2bc645b51523 AS builder
15+
FROM --platform=linux/amd64 golang:1.25.6-bookworm@sha256:fae400019c7fb0400bca0b749fde2015f993ff0e0293ca6f8dbaf919650bb419 AS builder
1616

1717
# Allows docker builds to set the BUILD_NUMBER
1818
ARG BUILD_NUMBER

go/tools/go-upgrade/go-upgrade.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package main
1818

1919
import (
2020
"bufio"
21+
"encoding/json"
2122
"fmt"
2223
"io"
2324
"log"
@@ -29,8 +30,6 @@ import (
2930
"strings"
3031
"time"
3132

32-
"encoding/json"
33-
3433
"github.com/google/go-containerregistry/pkg/crane"
3534
gocr "github.com/google/go-containerregistry/pkg/v1"
3635
"github.com/hashicorp/go-version"
@@ -363,6 +362,7 @@ func replaceGoVersionInCodebase(old, new *version.Version) error {
363362
"./build.env",
364363
"./docker/bootstrap/Dockerfile.common",
365364
"./docker/lite/Dockerfile",
365+
"./docker/lite/Dockerfile.mysql80",
366366
"./docker/lite/Dockerfile.mysql84",
367367
"./docker/lite/Dockerfile.percona80",
368368
"./docker/vttestserver/Dockerfile.mysql80",
@@ -479,7 +479,7 @@ func updateBootstrapVersionInCodebase(old, new string, newGoVersion *version.Ver
479479
}
480480

481481
func updateBootstrapChangelog(new string, goVersion *version.Version) error {
482-
file, err := os.OpenFile("./docker/bootstrap/CHANGELOG.md", os.O_RDWR, 0600)
482+
file, err := os.OpenFile("./docker/bootstrap/CHANGELOG.md", os.O_RDWR, 0o600)
483483
if err != nil {
484484
return err
485485
}
@@ -541,7 +541,7 @@ func replaceInFile(oldexps []*regexp.Regexp, new []string, fileToChange string)
541541
panic("old and new should be of the same length")
542542
}
543543

544-
f, err := os.OpenFile(fileToChange, os.O_RDWR, 0600)
544+
f, err := os.OpenFile(fileToChange, os.O_RDWR, 0o600)
545545
if err != nil {
546546
return err
547547
}

0 commit comments

Comments
 (0)