Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 4102765

Browse files
committed
RPM spec: remove -ce suffix from distribution_based_engine JSON
Noticed this failing in internal e2e tests on CentOS: ``` sudo docker engine activate --license /tmp/docker.lic unable to determine the installed engine version. Specify which engine image to update with --engine-image: open /var/lib/docker-engine/distribution_based_engine.json: no such file or directory ``` Looks lik 09b3ac8 changed the name of this file from `distribution_based_engine-ce.json` to `distribution_based_engine.json` (without `-ce` suffix) for the `.deb` packages, but did not update the RPM packages accordingly. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 77878ff) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 2dd0ad14545c6b79ddc3b101556852d304f153f9 Component: packaging
1 parent 8826447 commit 4102765

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

components/packaging/rpm/SPECS/docker-ce.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ install -D -m 0644 %{_topdir}/SOURCES/docker.service $RPM_BUILD_ROOT/%{_unitdir}
104104
install -D -m 0644 %{_topdir}/SOURCES/docker.socket $RPM_BUILD_ROOT/%{_unitdir}/docker.socket
105105

106106
# install json for docker engine activate / upgrade
107-
install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker-engine/distribution_based_engine-ce.json
107+
install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker-engine/distribution_based_engine.json
108108

109109
%files
110110
/%{_bindir}/dockerd
111111
/%{_bindir}/docker-proxy
112112
/%{_bindir}/docker-init
113113
/%{_unitdir}/docker.service
114114
/%{_unitdir}/docker.socket
115-
/var/lib/docker-engine/distribution_based_engine-ce.json
115+
/var/lib/docker-engine/distribution_based_engine.json
116116

117117
%post
118118
%systemd_post docker.service

0 commit comments

Comments
 (0)