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

[master] rpmlint: fix "W: no-documentation" #690

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[master] rpmlint: fix "W: no-documentation" #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions rpm/SPECS/docker-ce-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,15 @@ install -p -m 644 cli/man/man5/*.5 ${RPM_BUILD_ROOT}%{_mandir}/man5
install -d ${RPM_BUILD_ROOT}%{_mandir}/man8
install -p -m 644 cli/man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8

mkdir -p build-docs
for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
cp "cli/$cli_file" "build-docs/$cli_file"
for f in AUTHORS LICENSE MAINTAINERS NOTICE README.md; do
install -D -p -m 0644 "engine/$f" "build-docs/$f"
done

# list files owned by the package here
%files
%doc build-docs/LICENSE build-docs/MAINTAINERS build-docs/NOTICE build-docs/README.md
%doc build-docs/*
%license build-docs/LICENSE
%license build-docs/NOTICE
%{_bindir}/docker
%{_datadir}/bash-completion/completions/docker
%{_datadir}/zsh/vendor-completions/_docker
Expand Down
7 changes: 7 additions & 0 deletions rpm/SPECS/docker-ce-rootless-extras.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,14 @@ install -D -p -m 0755 engine/contrib/dockerd-rootless-setuptool.sh ${RPM_BUILD_R
install -D -p -m 0755 /usr/local/bin/rootlesskit ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit
install -D -p -m 0755 /usr/local/bin/rootlesskit-docker-proxy ${RPM_BUILD_ROOT}%{_bindir}/rootlesskit-docker-proxy

for f in AUTHORS LICENSE MAINTAINERS NOTICE README.md SECURITY.md; do
install -D -p -m 0644 "engine/$f" "docker-ce-rootless-extras-docs/$f"
done

%files
%doc docker-ce-rootless-extras-docs/*
%license docker-ce-rootless-extras-docs/LICENSE
%license docker-ce-rootless-extras-docs/NOTICE
%{_bindir}/dockerd-rootless.sh
%{_bindir}/dockerd-rootless-setuptool.sh
%{_bindir}/rootlesskit
Expand Down
7 changes: 7 additions & 0 deletions rpm/SPECS/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,14 @@ install -D -p -m 0755 /usr/local/bin/docker-init ${RPM_BUILD_ROOT}%{_bindir}/doc
install -D -m 0644 engine/contrib/init/systemd/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
install -D -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket

for f in AUTHORS LICENSE MAINTAINERS NOTICE README.md SECURITY.md; do
install -D -p -m 0644 "engine/$f" "docker-ce-docs/$f"
done

%files
%doc docker-ce-docs/*
%license docker-ce-docs/LICENSE
%license docker-ce-docs/NOTICE
%{_bindir}/dockerd
%{_bindir}/docker-proxy
%{_bindir}/docker-init
Expand Down
16 changes: 13 additions & 3 deletions rpm/SPECS/docker-scan-plugin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,32 @@ Docker Scan plugin for the Docker CLI.

%build
pushd ${RPM_BUILD_DIR}/src/scan-cli-plugin
bash -c 'TAG_NAME="%{_scan_version}" COMMIT="%{_scan_gitcommit}" PLATFORM_BINARY=docker-scan make native-build'
bash -c 'TAG_NAME="%{_scan_version}" COMMIT="%{_scan_gitcommit}" PLATFORM_BINARY=docker-scan make native-build'
popd

for f in LICENSE MAINTAINERS NOTICE README.md; do
install -D -p -m 0644 "${RPM_BUILD_DIR}/src/scan-cli-plugin/$f" "scan-cli-plugin-docs/$f"
done

%check
# FIXME: --version currently doesn't work as it makes a connection to the daemon, so using the plugin metadata instead
#${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-scan scan --accept-license --version
ver="$(${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-scan docker-cli-plugin-metadata | awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }')"; \
test "$ver" = "%{_scan_version}" && echo "PASS: docker-scan version OK" || (echo "FAIL: docker-scan version ($ver) did not match" && exit 1)
test "$ver" = "%{_scan_version}" && echo "PASS: docker-scan version OK" || (echo "FAIL: docker-scan version ($ver) did not match" && exit 1)

%install
pushd ${RPM_BUILD_DIR}/src/scan-cli-plugin
install -D -p -m 0755 bin/docker-scan ${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-scan
install -D -p -m 0755 bin/docker-scan ${RPM_BUILD_ROOT}%{_libexecdir}/docker/cli-plugins/docker-scan
popd

for f in AUTHORS LICENSE MAINTAINERS NOTICE README.md SECURITY.md; do
install -D -p -m 0644 "${RPM_BUILD_DIR}/src/scan-cli-plugin/$f" "scan-cli-plugin-docs/$f"
done

%files
%doc scan-cli-plugin-docs/*
%license scan-cli-plugin-docs/LICENSE
%license scan-cli-plugin-docs/NOTICE
%{_libexecdir}/docker/cli-plugins/docker-scan

%post
Expand Down