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

chore(agw): cleanup apt installs in agw Dockerfiles #13932

Merged

Conversation

wolfseb
Copy link
Contributor

@wolfseb wolfseb commented Sep 15, 2022

Signed-off-by: Sebastian Wolf sebastian.wolf@tngtech.com

Summary

This PR sorts all installed packages alphanumerically for better maintainability. Duplicate packages are removed. An explicit cleanup is introduced after every install, where it was not done yet.

Test Plan

Additional Information

  • This change is backwards-breaking

@wolfseb wolfseb requested a review from a team September 15, 2022 04:24
@wolfseb wolfseb requested a review from a team as a code owner September 15, 2022 04:24
@wolfseb wolfseb requested a review from maxhbr September 15, 2022 04:24
@pull-request-size pull-request-size bot added the size/L Denotes a Pull Request that changes 100-499 lines. label Sep 15, 2022
@github-actions
Copy link
Contributor

Thanks for opening a PR! 💯

A couple initial guidelines

Howto

  • Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
  • Checks. All required CI checks must pass before merge.
  • Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

If this is your first Magma PR, also consider reading

@github-actions github-actions bot added the component: ci All updates on CI (Jenkins/CircleCi/Github Action) label Sep 15, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2022

feg-workflow

    2 files  203 suites   40s ⏱️
374 tests 374 ✔️ 0 💤 0
388 runs  388 ✔️ 0 💤 0

Results for commit a1367cd.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2022

dp-workflow

14 tests   14 ✔️  2m 26s ⏱️
  1 suites    0 💤
  1 files      0

Results for commit a1367cd.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2022

agw-workflow

615 tests   611 ✔️  3m 51s ⏱️
    2 suites      4 💤
    2 files        0

Results for commit a1367cd.

♻️ This comment has been updated with latest results.

openvswitch-common \
openvswitch-datapath-dkms \
openvswitch-switch
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want a && rm -rf /var/lib/apt/lists/* here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added it.

libopenvswitch \
openvswitch-datapath-dkms \
openvswitch-common \
openvswitch-switch \
bcc-tools \
td-agent-bit \
wireguard
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want a && rm -rf /var/lib/apt/lists/* here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added it.

@jheidbrink
Copy link
Contributor

nitpick: personally I prefer meaningful git blame and better git log -p readability over alphabetically sorted lists. This is just to raise awareness of the advantage of not touching the lists, but it's fine with me if you prefer sorting anyway. :)

prometheus-cpp-dev \
liblfds710
RUN rm /etc/apt/sources.list.d/magma.list
&& rm /etc/apt/sources.list.d/magma.list
Copy link
Contributor

Choose a reason for hiding this comment

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

as discussed offlne: The RUN statement will remain untouched, and the rm will target /var/lib/apt/lists/* instead.

@wolfseb wolfseb force-pushed the cleanup_apt_installs_in_agw_dockerfiles branch 2 times, most recently from 0578127 to 753d705 Compare September 15, 2022 07:24
Sort all installed packages alphabetically, remove duplicates, and add
explicit cleanup after installing

Signed-off-by: Sebastian Wolf <sebastian.wolf@tngtech.com>
@wolfseb wolfseb force-pushed the cleanup_apt_installs_in_agw_dockerfiles branch from 753d705 to a1367cd Compare September 15, 2022 08:01
@ShubhamTatvamasi ShubhamTatvamasi merged commit 4299e29 into magma:master Sep 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: ci All updates on CI (Jenkins/CircleCi/Github Action) size/L Denotes a Pull Request that changes 100-499 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants