This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch 0.22.0
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/0.22.0 by this push:
new de90963fa FIX: no rule for .eslintrc.json FIX: outdated golang
versions in Dockerfiles
de90963fa is described below
commit de90963faa6f973af7c0be43d646fba38ea4976b
Author: Jens Geyer <[email protected]>
AuthorDate: Thu May 15 00:31:21 2025 +0200
FIX: no rule for .eslintrc.json
FIX: outdated golang versions in Dockerfiles
---
Makefile.am | 1 -
build/docker/ubuntu-focal/Dockerfile | 4 ++--
build/docker/ubuntu-jammy/Dockerfile | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7b455e886..bbae44fa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,7 +139,6 @@ EXTRA_DIST = \
.clang-format \
.dockerignore \
.editorconfig \
- .eslintrc.json \
.flake8 \
.gitattributes \
.gitignore \
diff --git a/build/docker/ubuntu-focal/Dockerfile
b/build/docker/ubuntu-focal/Dockerfile
index 831d07e95..50bb64c01 100644
--- a/build/docker/ubuntu-focal/Dockerfile
+++ b/build/docker/ubuntu-focal/Dockerfile
@@ -159,9 +159,9 @@ RUN apt-get install -y --no-install-recommends \
libglib2.0-dev
# golang
-ENV GOLANG_VERSION 1.21.7
+ENV GOLANG_VERSION 1.24.3
ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256
13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c
+ENV GOLANG_DOWNLOAD_SHA256
3333f6ea53afa971e9078895eaa4ac7204a8c6b5c68c10e6bc9a33e8e391bdd8
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz && \
echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - && \
tar -C /usr/local -xzf golang.tar.gz && \
diff --git a/build/docker/ubuntu-jammy/Dockerfile
b/build/docker/ubuntu-jammy/Dockerfile
index f2001ffd7..220fa2b6b 100644
--- a/build/docker/ubuntu-jammy/Dockerfile
+++ b/build/docker/ubuntu-jammy/Dockerfile
@@ -159,9 +159,9 @@ RUN apt-get install -y --no-install-recommends \
libglib2.0-dev
# golang
-ENV GOLANG_VERSION 1.21.7
+ENV GOLANG_VERSION 1.24.3
ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256
13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c
+ENV GOLANG_DOWNLOAD_SHA256
3333f6ea53afa971e9078895eaa4ac7204a8c6b5c68c10e6bc9a33e8e391bdd8
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz && \
echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - && \
tar -C /usr/local -xzf golang.tar.gz && \