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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 8 commits into from
Apr 12, 2023
Merged

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

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20d944f
rpm spec to require moby-engine or docker-ce
bilalsellak Mar 28, 2023
953ca8d
Updated enterprise linux rpm spec
bilalsellak Mar 28, 2023
fe4d661
Added centos7 spec changes
bilalsellak Mar 30, 2023
2748c09
Reverting centos7 changes
bilalsellak Mar 31, 2023
c48b1c5
Wrong symbol
bilalsellak Mar 31, 2023
d2d2a7a
Merge branch 'main' into rpm-spec-update
bilalsellak Apr 5, 2023
296a80e
Merge branch 'main' into rpm-spec-update
bilalsellak Apr 7, 2023
e1d7e45
Merge branch 'main' into rpm-spec-update
bilalsellak Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions edgelet/contrib/enterprise-linux/aziot-edge.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ URL: https://github.com/azure/iotedge
%{?systemd_requires}
BuildRequires: systemd
Requires(pre): shadow-utils
Requires: (moby-engine or docker-ce)
Requires: aziot-identity-service = 1.4.0~dev-1%{?dist}
Source0: aziot-edge-%{version}.tar.gz

Expand Down Expand Up @@ -61,7 +62,7 @@ make \
%clean
rm -rf $RPM_BUILD_ROOT

%pre
%post
# Check for container runtime
if ! /usr/bin/getent group docker >/dev/null; then
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
Expand Down Expand Up @@ -115,9 +116,7 @@ fi
if /usr/bin/getent group aziotid >/dev/null; then
%{_sbindir}/usermod -aG aziotid %{iotedge_user}
fi
exit 0

%post
if [ ! -f '/etc/aziot/config.toml' ]; then
echo "==============================================================================="
echo ""
Expand Down