diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b242f9008..997dbd5573 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ workflows: jobs: build: environment: - DOCKER_TAG: chronograf-20220404 + DOCKER_TAG: chronograf-20220609 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -61,7 +61,7 @@ jobs: deploy-nightly: environment: - DOCKER_TAG: chronograf-20220404 + DOCKER_TAG: chronograf-20220609 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -90,7 +90,7 @@ jobs: deploy-pre-release: environment: - DOCKER_TAG: chronograf-20220404 + DOCKER_TAG: chronograf-20220609 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -121,7 +121,7 @@ jobs: deploy-release: environment: - DOCKER_TAG: chronograf-20220404 + DOCKER_TAG: chronograf-20220609 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml index dca0cef0b1..27c894ddf9 100644 --- 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.18' + go-version: '1.18.3' - uses: actions/setup-node@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d5d4a6eff..739d061454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,8 @@ 1. [#5896](https://github.com/influxdata/chronograf/pull/5896): Add cypress tests with github workflows. 1. [#5898](https://github.com/influxdata/chronograf/pull/5898): Upgrade javascript dependencies. 1. [#5897](https://github.com/influxdata/chronograf/pull/5897): Upgrade golang to 1.18. -1. [#5915](https://github.com/influxdata/chronograf/pull/5915): Upgrade github.com/lestrrat-go/jwx to v2 +1. [#5915](https://github.com/influxdata/chronograf/pull/5915): Upgrade github.com/lestrrat-go/jwx to v2. +1. [#5933](https://github.com/influxdata/chronograf/pull/5933): Upgrade golang to 1.18.3 . ## v1.9.4 [2022-03-22] diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index ef1b5f4d18..c0d2b4a835 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -33,7 +33,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ # Install go ENV GOPATH /root/go -ENV GO_VERSION 1.18 +ENV GO_VERSION 1.18.3 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/run.sh b/etc/scripts/docker/run.sh index fab3048587..bf07df0bd2 100755 --- 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-20220404" +test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20220609" docker run \ -e AWS_ACCESS_KEY_ID \