Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update alpine base image to 3.13 #3838

Merged
merged 5 commits into from
Mar 17, 2021
Merged

Update alpine base image to 3.13 #3838

merged 5 commits into from
Mar 17, 2021

Conversation

gaby
Copy link
Contributor

@gaby gaby commented Mar 11, 2021

Update alpine 3.11 to latest patch version.

It would make more sense at this point to update to 3.13, let me know if you want make to make the change.

Change log for 3.11.8: https://alpinelinux.org/posts/Alpine-3.10.6-3.11.8-3.12.4-released.html

Update alpine 3.11 to latest patch version.
@bboreham
Copy link
Collaborator

Happy to make a bigger jump.

I don't believe Alpine flaws are exploitable in a normal Scope situation, but I recognize that folks run tools which highlight them.

@gaby gaby changed the title Update alpine base image to 3.11.8 Update alpine base image to 3.13 Mar 11, 2021
@gaby
Copy link
Contributor Author

gaby commented Mar 11, 2021

@bboreham Great, changes have been made. Alpine now points to 3.13

@kingdonb
Copy link
Contributor

Looks like the build fails now, you might try adding libpcap-dev?

Also, the old Dockerfile was specific about MAJOR.MINOR.Patch, let's keep that property... would you change the form of the FROM line from 3.13 back to 3.13.2 that mentions the more specific latest release available at this time?

@gaby
Copy link
Contributor Author

gaby commented Mar 11, 2021

Test still failing, I will take a look again tonight. The integration test for alpine 3.11.8 also failed, so it must be something else missing.

See google/gopacket#734

@gaby
Copy link
Contributor Author

gaby commented Mar 14, 2021

@bboreham @kingdonb I tried debugging this, but I can't figure out why it fails. PR #3834 is also failing with the same error.

Add bbc-tools as indicated on gobpf github.
@bboreham
Copy link
Collaborator

The integration tests basically don't run at all for 3rd-party forks, due to mining. #2192

I have pushed your branch as 1st-party, so now the tests will re-run and hopefully succeed.

I apoologise the error message is very hard to understand; it would be better to fail the job straight off if it doesn't have secrets.

WORKDIR /home/weave
RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl
RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl bcc-tools libpcap-dev
Copy link
Collaborator

Choose a reason for hiding this comment

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

We don't want things relating to 'dev' in the final release container; we have a build container for those.

I backed out this change at 5331034
so we can check the CI run at https://app.circleci.com/pipelines/github/weaveworks/scope/357/workflows/a74f43bf-9696-4bff-bb60-a969f6a02b46

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bboreham Thank you for looking at this, tests look good.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok, do you want to update your branch so I can merge this PR, or shall I merge that branch above?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bboreham Done, I just removed the dev dependencies from my branch.

@bboreham bboreham merged commit 69dd885 into weaveworks:master Mar 17, 2021
@gaby gaby deleted the bump-alpine branch March 17, 2021 13:26
@Kielek
Copy link
Contributor

Kielek commented Mar 18, 2021

@bboreham, do you have any plans to official 1.13.2 release with the latest changes? Including new alpine?

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants