Skip to content

Commit

Permalink
Merge pull request #5933 from influxdata/5928/go_1.18.3
Browse files Browse the repository at this point in the history
fix(security): upgrade golang to 1.18.3
  • Loading branch information
sranka authored Jun 13, 2022
2 parents eaf4dc9 + 08136f3 commit 646bdad
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ workflows:
jobs:
build:
environment:
DOCKER_TAG: chronograf-20220404
DOCKER_TAG: chronograf-20220609
GO111MODULE: "ON"
machine:
image: ubuntu-2004:202201-02
Expand All @@ -61,7 +61,7 @@ jobs:

deploy-nightly:
environment:
DOCKER_TAG: chronograf-20220404
DOCKER_TAG: chronograf-20220609
GO111MODULE: "ON"
machine:
image: ubuntu-2004:202201-02
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:

deploy-release:
environment:
DOCKER_TAG: chronograf-20220404
DOCKER_TAG: chronograf-20220609
GO111MODULE: "ON"
machine:
image: ubuntu-2004:202201-02
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chronograf-cypress-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion etc/Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 646bdad

Please sign in to comment.