Merge pull request #6094 from influxdata/chore/go1.21.10

chore(build): upgrade Go to 1.21.10
influxdata · May 16, 2024 · 9c4b1aa · 9c4b1aa
2 parents fb6d863 + 8bbdca5
commit 9c4b1aa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -96,7 +96,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -125,7 +125,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02
@@ -160,7 +160,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20240416
+      DOCKER_TAG: chronograf-20240509
       GO111MODULE: "ON"
     machine:
       image: ubuntu-2004:202201-02

diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21.9'
+          go-version: '1.21.10'
 
       - uses: actions/setup-node@v2
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [unreleased]
 
+### Other
+
+1. [#6094](https://github.com/influxdata/chronograf/pull/6094): Upgrade golang to 1.21.10.
+
 ## v1.10.4 [2024-04-25]
 
 ### Other

diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
@@ -34,7 +34,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.21.9
+ENV GO_VERSION 1.21.10
 ENV GO_ARCH amd64
 ENV GO111MODULES ON
 RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \

diff --git a/etc/scripts/docker/build.sh b/etc/scripts/docker/build.sh
@@ -3,7 +3,7 @@ set -x
 
 DOCKER_TAG="chronograf-$(date +%Y%m%d)"
 
-docker build --rm=false -f etc/Dockerfile_build -t builder:$DOCKER_TAG .
+docker build --rm=false --platform linux/amd64 -f etc/Dockerfile_build -t builder:$DOCKER_TAG .
 docker tag builder:$DOCKER_TAG quay.io/influxdb/builder:$DOCKER_TAG
 
 docker push quay.io/influxdb/builder:$DOCKER_TAG
diff --git a/etc/scripts/docker/run.sh b/etc/scripts/docker/run.sh
@@ -14,7 +14,7 @@ test -z $SSH_KEY_PATH && SSH_KEY_PATH="$HOME/.ssh/id_rsa"
 echo "Using SSH key located at: $SSH_KEY_PATH"
 
 # Default docker tag if not specified
-test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240416"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240509"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \