Skip to content

Update Dockerfile - #5159

Merged
alvinlin123 merged 21 commits into
cortexproject:masterfrom
mehrdadbn9:master
Mar 3, 2023
Merged

Update Dockerfile#5159
alvinlin123 merged 21 commits into
cortexproject:masterfrom
mehrdadbn9:master

Conversation

@mehrdadbn9

@mehrdadbn9 mehrdadbn9 commented Feb 18, 2023

Copy link
Copy Markdown
Contributor

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]

@mehrdadbn9
Update Dockerfile
cf456ab 
Signed-off-by: mehrdadbn9 <[email protected]>
@alanprot

alanprot commented Feb 21, 2023

Copy link
Copy Markdown
Member

Can u update the changelog?

@mehrdadbn9 mehrdadbn9 mentioned this pull request Feb 21, 2023
Closed
3 tasks
@alvinlin123

alvinlin123 commented Feb 21, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

@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.

@pull-request-size pull-request-size Bot added size/S and removed size/XS labels Mar 2, 2023
@pull-request-size pull-request-size Bot added size/M and removed size/S labels Mar 2, 2023
@alvinlin123 alvinlin123 closed this Mar 3, 2023
@alvinlin123 alvinlin123 reopened this Mar 3, 2023
@alvinlin123
alvinlin123 requested a review from friedrichg March 3, 2023 03:18
@alvinlin123
alvinlin123 requested review from alanprot and removed request for friedrichg March 3, 2023 03:18
@alvinlin123

alvinlin123 commented Mar 3, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

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
alvinlin123 reviewed Mar 3, 2023
View reviewed changes
Comment thread build-image/Dockerfile
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

@alvinlin123 alvinlin123 Mar 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

friedrichg
friedrichg approved these changes Mar 3, 2023
View reviewed changes
Comment thread .github/workflows/test-build-deploy.yml
Comment on lines +110 to +115
- requires_docker
- integration_alertmanager
- integration_backward_compatibility
- integration_memberlist
- integration_querier
- integration_ruler

@friedrichg friedrichg Mar 3, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@alvinlin123 alvinlin123 Mar 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread .github/workflows/test-build-deploy.yml
uses: actions/setup-go@v2
with:
go-version: 1.19.x
go-version: 1.20.1

@friedrichg friedrichg Mar 3, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 More specific is better

Comment thread .github/workflows/test-build-deploy.yml Outdated
Comment thread .github/workflows/test-build-deploy.yml Outdated
Comment thread .github/workflows/test-build-deploy.yml Outdated
Comment thread .github/workflows/test-build-deploy.yml Outdated
Comment thread .github/workflows/test-build-deploy.yml Outdated
alvinlin123 and others added 5 commits March 3, 2023 08:04
@alvinlin123 @friedrichg
Update .github/workflows/test-build-deploy.yml
91bca4d 
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
@alvinlin123 @friedrichg
Update .github/workflows/test-build-deploy.yml
b815b5d 
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
@alvinlin123 @friedrichg
Update .github/workflows/test-build-deploy.yml
a397947 
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
@alvinlin123 @friedrichg
Update .github/workflows/test-build-deploy.yml
a755b3b 
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
@alvinlin123 @friedrichg
Update .github/workflows/test-build-deploy.yml
8cdba37 
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
@alvinlin123
alvinlin123 enabled auto-merge (squash) March 3, 2023 16:30
@alvinlin123
alvinlin123 merged commit b47e7b6 into cortexproject:master Mar 3, 2023
alexqyle pushed a commit to alexqyle/cortex that referenced this pull request May 2, 2023
@mehrdadbn9 @alvinlin123
@friedrichg @alexqyle
Update Dockerfile (cortexproject#5159)
0275696 
* Update Dockerfile to upgrade Go runtime version.

Signed-off-by: mehrdadbn9 <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
Signed-off-by: Alvin Lin <[email protected]>
Co-authored-by: Alvin Lin <[email protected]>
Co-authored-by: Alvin Lin <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Alex Le <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@friedrichg friedrichg friedrichg approved these changes
@alanprot alanprot alanprot approved these changes
+1 more reviewer
@alvinlin123 alvinlin123 alvinlin123 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size/M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Upgrade cortexto use go 1.20

4 participants

@mehrdadbn9 @alanprot @alvinlin123 @friedrichg