Bug 1390766
| Summary: | Spec file changes required for docker-storage-setup | ||
|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Vivek Goyal <vgoyal> |
| Component: | docker | Assignee: | Antonio Murdaca <amurdaca> |
| Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
| Severity: | medium | Docs Contact: | |
| Priority: | unspecified | ||
| Version: | 25 | CC: | adimania, admiller, amurdaca, atomic-bugs, dwalsh, ichavero, jcajka, jchaloup, lsm5, marianne, miminar, nalin, riek, santiago, vbatts |
| Target Milestone: | --- | Keywords: | Extras |
| Target Release: | --- | ||
| Hardware: | Unspecified | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Fixed In Version: | docker-1.12.3-6.git9a594b9.fc25 | Doc Type: | If docs needed, set a value |
| Doc Text: | Story Points: | --- | |
| Clone Of: | 1390762 | Environment: | |
| Last Closed: | 2016-11-19 21:13:56 UTC | Type: | Bug |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
|
Description
Vivek Goyal
2016-11-01 21:22:49 UTC
docker storage setup should have a Makefile to install these. We should not rely on the spec file to find these changes. Antonio, Could you please start using latest docker-storage-setup now. We have a bug fix in there, and also now we have a Makefile in there (thanks to Dan) and that should take care of installing relevant files and docker.spec file should become little simple. Vivek, yes, I'm rebuilding it using the latest commit here https://github.com/projectatomic/docker-storage-setup/commits/master This is what I did and it seems to be working correctly https://paste.fedoraproject.org/468770/ docker-1.12.3-3.git91ae1d1.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-11c7bec824 Thanks Antonio,
Two minor nits.
I think we will require one entry for man page file in %files section.
%{_mandir}/man1/docker-storage-setup.1
Secondly, I see following in existing docker.spec. Not sure what it is.
%{dss_libdir}/*
Should we get rid of this?
Also I see a file "docker-storage.sysconfig" present in repo. Do we require this file? Vivek, man pages in %files are taken care elsewhere under %files so everything is correct. Dss_libdir just includes every file under the docker-storage-setup libdir. Finally I guess we can now safely remove docker-storage.sysconfig if the makefile installs it. Thanks, you can try the F25 build though and report there in bodhi if something isn't working. I see two lines.
%dir %{dss_libdir}
%{dss_libdir}/*
I thought first line takes care of including all files in /usr/lib/docker-storage-setup.
What is second line doing?
Or you think that we need both and first one itself is not sufficient. "make install" does not install /etc/sysconfig/docker-storage. I did not see current docker.spec installing it either. IIRC, in the past we used to install it by default. Now expectation is that it will be generated from docker-storage-setup. So there are two questions which need to be answered. - Should we install an empty /etc/sysconfig/docker-storage by default. - Is current code doing it. If not, when did we stop doing it and why. I can't see a reason that why should we install /etc/sysconfig/docker-storage by default. I am not expecting users to edit this file. And it will be auto-generated when docker-storage-setup runs. We should not install it. docker-1.12.3-3.git91ae1d1.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report. See https://fedoraproject.org/wiki/QA:Updates_Testing for instructions on how to install test updates. You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-11c7bec824 docker-1.12.3-6.git9a594b9.fc25 has been submitted as an update to Fedora 25. https://bodhi.fedoraproject.org/updates/FEDORA-2016-15cf686c8d docker-1.12.3-6.git9a594b9.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report. See https://fedoraproject.org/wiki/QA:Updates_Testing for instructions on how to install test updates. You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-15cf686c8d docker-1.12.3-6.git9a594b9.fc25 has been pushed to the Fedora 25 stable repository. If problems still persist, please make note of it in this bug report. |