Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Install only wireguard-tools, rev text VMs to 20.04 #2375

Merged
merged 2 commits into from
Jun 10, 2020

Conversation

fasaxc
Copy link
Member

@fasaxc fasaxc commented Jun 10, 2020

Description

Avoid installing the wireguard kernel module in the docker image. It's not needed and it has started pulling in dependencies such as grub, causing the build to fail.

Todos

  • Backport

Release Note

None required

Copy link
Member

@nelljerram nelljerram left a comment

Choose a reason for hiding this comment

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

LGTM, subject to passing CI.

Should support wireguard out of the box.
@fasaxc fasaxc changed the title Only install wireguard-tools package. Install only wireguard-tools, rev text VMs to 20.04 Jun 10, 2020
@@ -19,4 +19,4 @@ FROM ubuntu:eoan
LABEL maintainer="Gaurav <gaurav@tigera.io>"

RUN apt-get update && \
apt-get install wireguard -y
apt-get install --no-install-recommends wireguard-tools -y
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need to be "FROM ubuntu:focal"?

Copy link
Contributor

@realgaurav realgaurav left a comment

Choose a reason for hiding this comment

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

CI passing, @fasaxc let's get this one in.
We can address any OS and package changes later.

Thanks

@robbrockbank robbrockbank merged commit bdecac6 into projectcalico:master Jun 10, 2020
@fasaxc fasaxc mentioned this pull request Jun 11, 2020
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants