mirror of
https://github.com/containers/skopeo.git
synced 2025-07-19 17:17:11 +00:00
Add a default policy file, install it in (make install) and integration tests
(skopeo copy) will soon ALWAYS require a present policy file. So, install one by (make install), and ensure that integration tests do so as well. Also simplifies the usage of install(1) a bit.
This commit is contained in:
parent
d5d6bc28f7
commit
d4462330a5
8
Makefile
8
Makefile
@ -5,6 +5,7 @@ export GO15VENDOREXPERIMENT=1
|
|||||||
PREFIX ?= ${DESTDIR}/usr
|
PREFIX ?= ${DESTDIR}/usr
|
||||||
INSTALLDIR=${PREFIX}/bin
|
INSTALLDIR=${PREFIX}/bin
|
||||||
MANINSTALLDIR=${PREFIX}/share/man
|
MANINSTALLDIR=${PREFIX}/share/man
|
||||||
|
CONTAINERSSYSCONFIGDIR=${DESTDIR}/etc/containers
|
||||||
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
|
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
|
||||||
GO_MD2MAN ?= /usr/bin/go-md2man
|
GO_MD2MAN ?= /usr/bin/go-md2man
|
||||||
|
|
||||||
@ -60,14 +61,13 @@ clean:
|
|||||||
rm -f skopeo docs/*.1
|
rm -f skopeo docs/*.1
|
||||||
|
|
||||||
install: install-binary install-docs install-completions
|
install: install-binary install-docs install-completions
|
||||||
|
install -D -m 644 default-policy.json ${CONTAINERSSYSCONFIGDIR}/policy.json
|
||||||
|
|
||||||
install-binary: ./skopeo
|
install-binary: ./skopeo
|
||||||
install -d -m 0755 ${INSTALLDIR}
|
install -D -m 755 skopeo ${INSTALLDIR}/skopeo
|
||||||
install -m 755 skopeo ${INSTALLDIR}
|
|
||||||
|
|
||||||
install-docs: docs/skopeo.1
|
install-docs: docs/skopeo.1
|
||||||
install -d -m 0755 ${MANINSTALLDIR}/man1
|
install -D -m 644 docs/skopeo.1 ${MANINSTALLDIR}/man1/skopeo.1
|
||||||
install -m 644 docs/skopeo.1 ${MANINSTALLDIR}/man1/
|
|
||||||
|
|
||||||
install-completions:
|
install-completions:
|
||||||
install -m 644 -T hack/make/bash_autocomplete ${BASHINSTALLDIR}/skopeo
|
install -m 644 -T hack/make/bash_autocomplete ${BASHINSTALLDIR}/skopeo
|
||||||
|
7
default-policy.json
Normal file
7
default-policy.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"default": [
|
||||||
|
{
|
||||||
|
"type": "insecureAcceptAnything"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -9,7 +9,7 @@ bundle_test_integration() {
|
|||||||
# subshell so that we can export PATH without breaking other things
|
# subshell so that we can export PATH without breaking other things
|
||||||
(
|
(
|
||||||
make binary-local
|
make binary-local
|
||||||
make install-binary
|
make install
|
||||||
export GO15VENDOREXPERIMENT=1
|
export GO15VENDOREXPERIMENT=1
|
||||||
bundle_test_integration
|
bundle_test_integration
|
||||||
) 2>&1
|
) 2>&1
|
||||||
|
Loading…
Reference in New Issue
Block a user