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

[docker-dhcprelay]: Update to Bullseye #9736

Merged
merged 1 commit into from
Jan 18, 2022

Conversation

saiarcot895
Copy link
Contributor

Signed-off-by: Saikrishna Arcot [email protected]

Why I did it

How I did it

  1. Change the dhcprelay Dockerfile to be based on docker-config-engine-bullseye instead of docker-config-engine-buster.
  2. To fix some compile errors in isc-dhcp (for dhcprelay), update it to the version that's used in Bullseye. However, this version isn't in the git repository that Debian uses for packaging, since it was a NMU (non-maintainer upload). Therefore, the code to get the source code has to be changed.
  3. Clean up and update the debian packaging files to automatically read and record runtime dependencies and make the build-time dependencies more accurate.
  4. Modify the Bullseye slave container to just get the default Boost version's headers, instead of explicitly specifying it there.

How to verify it

Ran dhcp_relay/test_dhcpv6_relay.py and dhcp_relay/test_dhcp_relay.py and verified that they passed.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

Update the dhcprelay container to Bullseye, and update isc-dhcp as well

A picture of a cute animal (not mandatory but encouraged)

As part of this, update the isc-dhcp package to match the Bullseye
version (this fixes some compile errors related to BIND), clean up some
of the build dependencies and runtime dependencies for debian packaging,
and use the default Boost version to compile against instead of
explicitly saying using 1.74.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895 saiarcot895 merged commit bb33627 into sonic-net:master Jan 18, 2022
@saiarcot895 saiarcot895 deleted the bullseye-dhcp-relay branch January 18, 2022 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants