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

RHEL8 spec update to require moby-engine or docker-ce #6972

Merged
merged 8 commits into from
Apr 12, 2023

Conversation

bilalsellak
Copy link
Contributor

@bilalsellak bilalsellak commented Mar 28, 2023

Adding a requires clause to spec for rhel8 "Requires: (moby-engine or docker-ce)", as well as moving check for docker group to %post.

Azure IoT Edge PR checklist:

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines and Best Practices

  • [ X] I have read the contribution guidelines.
  • [ X] Title of the pull request is clear and informative.
  • [X ] Description of the pull request includes a concise summary of the enhancement or bug fix.

Testing Guidelines

  • Pull request includes test coverage for the included changes.
  • Description of the pull request includes
    • concise summary of tests added/modified
    • local testing done.

Draft PRs

  • Open the PR in Draft mode if it is:
    • Work in progress or not intended to be merged.
    • Encountering multiple pipeline failures and working on fixes.

Note: We use the kodiakhq bot to merge PRs once the necessary checks and approvals are in place. When it merges a PR, kodiakhq converts the PR title to the commit title, PR description to the commit description, and squashes all the commits in the PR to a single commit. The net effect is that entire PR becomes a single commit. Please follow the best practices mentioned here for the PR title and description

@bilalsellak bilalsellak changed the title [DRAFT] RHEL8 spec update to require moby-engine or docker-ce RHEL8 spec update to require moby-engine or docker-ce Mar 29, 2023
@bilalsellak bilalsellak marked this pull request as ready for review March 29, 2023 22:32
@arsing
Copy link
Member

arsing commented Mar 29, 2023

What about edgelet/contrib/centos/aziot-edge.spec ? Did you test that it does not support or ?

@bilalsellak bilalsellak marked this pull request as draft March 30, 2023 16:38
@bilalsellak
Copy link
Contributor Author

What about edgelet/contrib/centos/aziot-edge.spec ? Did you test that it does not support or ?

Just tested this. Does not support or

@arsing
Copy link
Member

arsing commented Mar 31, 2023

Cool, so just test these scenarios on EL8 to be sure:

  1. With neither Docker repo nor MS repo added, yum install aziot-edge should fail because it can't satisfy the requirement.

  2. With just Docker repo added but not MS repo, yum install aziot-edge should automatically pull in docker-ce.

  3. With just MS repo added but not Docker repo, yum install aziot-edge should automatically pull in moby-engine.

  4. With both Docker and MS repos added, what does it do?

@bilalsellak
Copy link
Contributor Author

Cool, so just test these scenarios on EL8 to be sure:

  1. With neither Docker repo nor MS repo added, yum install aziot-edge should fail because it can't satisfy the requirement.
  2. With just Docker repo added but not MS repo, yum install aziot-edge should automatically pull in docker-ce.
  3. With just MS repo added but not Docker repo, yum install aziot-edge should automatically pull in moby-engine.
  4. With both Docker and MS repos added, what does it do?

Defaults to docker repo

@bilalsellak bilalsellak marked this pull request as ready for review April 5, 2023 17:15
@arsing
Copy link
Member

arsing commented Apr 5, 2023

Hmm, it would be nice if it preferred moby-engine, but I guess it's fine.

@bilalsellak bilalsellak merged commit 1b1d60f into Azure:main Apr 12, 2023
bilalsellak added a commit to bilalsellak/iotedge that referenced this pull request May 11, 2023
bilalsellak added a commit that referenced this pull request May 25, 2023
* RHEL8 spec update to require moby-engine or docker-ce (#6972)

Co-authored-by: Andrew Smith <andsmi@microsoft.com>
Co-authored-by: Damon Barry <damonbarry@users.noreply.github.com>
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.

3 participants