Update Dockerfile #5159

mehrdadbn9 · 2023-02-18T03:06:54Z

What this PR does:
Upgrade cortexto use go 1.20

Which issue(s) this PR fixes:
Fixes #5147

Checklist

Tests updated
Documentation added
CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: mehrdadbn9 <80095851+mehrdadbn9@users.noreply.github.com>

alanprot · 2023-02-21T18:25:34Z

Can u update the changelog?

alvinlin123 · 2023-02-21T22:36:24Z

@mehrdadbn9 I lied when I told you that all you need to do is update the Dockerfile :) there are few more steps involved.

I have push a build image using the change in this PR (this step can only be done by maintainers).

The new build image is quay.io/cortexproject/build-image:upgrade-to-go1.20.1-e6945e022

Can you please follow step 5 in https://cortexmetrics.io/docs/contributing/how-to-update-the-build-image/ to have the GitHub workflow files and Makefile updated?

Reference commit: ddc56a0

Once you update this PR with the changes, the approval workflow will let us know if the new build image is ready to go or not.

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

alvinlin123 · 2023-03-03T03:19:41Z

Sorry for the large amount of commits. Along the way of upgrade Go Lang I had to upgrade dependencies and fix bunch of issues. But, build finally works.

alvinlin123 · 2023-03-03T03:25:52Z

build-image/Dockerfile

@@ -23,7 +23,7 @@ RUN GOARCH=$(go env GOARCH) && \
 	chmod +x shfmt && \
 	mv shfmt /usr/bin

-RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.48.0
+RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.51.2


Reason for upgrading the version here is because the older version times out while running linter. However, the new version flagged few errors which I fixed/suppressed the in this PR.

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

friedrichg · 2023-03-03T09:28:54Z

.github/workflows/test-build-deploy.yml

+          - requires_docker
+          - integration_alertmanager
+          - integration_backward_compatibility
+          - integration_memberlist
+          - integration_querier
+          - integration_ruler


thanks for fixing my linting bug :P. We should test lint on these yamls

Oh I didn't fix it ... my IDE does it for me ;)

friedrichg · 2023-03-03T09:29:28Z

.github/workflows/test-build-deploy.yml

    steps:
      - name: Upgrade golang
        uses: actions/setup-go@v2
        with:
-          go-version: 1.19.x
+          go-version: 1.20.1


👍 More specific is better

.github/workflows/test-build-deploy.yml

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

* Update Dockerfile to upgrade Go runtime version. Signed-off-by: mehrdadbn9 <80095851+mehrdadbn9@users.noreply.github.com> Signed-off-by: Alvin Lin <alvinlin@amazon.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com> Co-authored-by: Alvin Lin <alvinlin@amazon.com> Co-authored-by: Alvin Lin <alvinlin123@gmail.com> Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alex Le <leqiyue@amazon.com>

Update Dockerfile

cf456ab

Signed-off-by: mehrdadbn9 <80095851+mehrdadbn9@users.noreply.github.com>

pull-request-size bot added the size/XS label Feb 18, 2023

Merge branch 'cortexproject:master' into master

e6945e0

mehrdadbn9 mentioned this pull request Feb 21, 2023

Update CHANGELOG.md #5165

Closed

3 tasks

Use build image for Go 1.20.1

e59c0bc

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

pull-request-size bot added size/S and removed size/XS labels Mar 2, 2023

Merge branch 'master' into master

da8c79f

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

pull-request-size bot added size/M size/S and removed size/S size/M labels Mar 2, 2023

Fix 'detected dubious ownership' error from git

e0201fd

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

pull-request-size bot added size/M and removed size/S labels Mar 2, 2023

alvinlin123 added 4 commits March 2, 2023 13:52

opps, fix careless typo

9b4c855

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

Remove settingup safe.direcotry for non-container jobs

c86be3f

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

Need to upgrade go4.org/intern for go 1.20

0d34ff0

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

increase timeout for golangci-lint see if it pass the build

35481f7

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

alvinlin123 closed this Mar 3, 2023

alvinlin123 reopened this Mar 3, 2023

alvinlin123 added 6 commits March 2, 2023 17:27

increase timeout for golangci-lint see if it pass the build

3208866

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

let's see if newever version of golanci-lint is faster

d624428

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

dummy commit

fa82ca1

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

remove dummy commit file

4573215

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

fix bogus space in workflow file

a36d0a5

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

Fix bunch of revive linter errors

483669e

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

alvinlin123 requested a review from friedrichg March 3, 2023 03:18

alvinlin123 requested review from alanprot and removed request for friedrichg March 3, 2023 03:18

alvinlin123 reviewed Mar 3, 2023

View reviewed changes

Update doc for updating Go runtime

5430134

Signed-off-by: Alvin Lin <alvinlin@amazon.com>

alanprot approved these changes Mar 3, 2023

View reviewed changes

friedrichg approved these changes Mar 3, 2023

View reviewed changes

alvinlin123 and others added 5 commits March 3, 2023 08:04

Update .github/workflows/test-build-deploy.yml

91bca4d

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

Update .github/workflows/test-build-deploy.yml

b815b5d

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

Update .github/workflows/test-build-deploy.yml

a397947

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

Update .github/workflows/test-build-deploy.yml

a755b3b

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

Update .github/workflows/test-build-deploy.yml

8cdba37

Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Alvin Lin <alvinlin123@gmail.com>

alvinlin123 enabled auto-merge (squash) March 3, 2023 16:30

alvinlin123 merged commit b47e7b6 into cortexproject:master Mar 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Dockerfile #5159

Update Dockerfile #5159

mehrdadbn9 commented Feb 18, 2023

alanprot commented Feb 21, 2023

alvinlin123 commented Feb 21, 2023 •

edited

alvinlin123 commented Mar 3, 2023 •

edited

alvinlin123 Mar 3, 2023

friedrichg Mar 3, 2023

alvinlin123 Mar 3, 2023

friedrichg Mar 3, 2023

Update Dockerfile #5159

Update Dockerfile #5159

Conversation

mehrdadbn9 commented Feb 18, 2023

alanprot commented Feb 21, 2023

alvinlin123 commented Feb 21, 2023 • edited

alvinlin123 commented Mar 3, 2023 • edited

alvinlin123 Mar 3, 2023

Choose a reason for hiding this comment

friedrichg Mar 3, 2023

Choose a reason for hiding this comment

alvinlin123 Mar 3, 2023

Choose a reason for hiding this comment

friedrichg Mar 3, 2023

Choose a reason for hiding this comment

alvinlin123 commented Feb 21, 2023 •

edited

alvinlin123 commented Mar 3, 2023 •

edited