diff --git a/Makefile b/Makefile index 19bd3962..17d1198f 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ export GO15VENDOREXPERIMENT=1 PREFIX ?= ${DESTDIR}/usr INSTALLDIR=${PREFIX}/bin MANINSTALLDIR=${PREFIX}/share/man +CONTAINERSSYSCONFIGDIR=${DESTDIR}/etc/containers BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions GO_MD2MAN ?= /usr/bin/go-md2man @@ -60,14 +61,13 @@ clean: rm -f skopeo docs/*.1 install: install-binary install-docs install-completions + install -D -m 644 default-policy.json ${CONTAINERSSYSCONFIGDIR}/policy.json install-binary: ./skopeo - install -d -m 0755 ${INSTALLDIR} - install -m 755 skopeo ${INSTALLDIR} + install -D -m 755 skopeo ${INSTALLDIR}/skopeo install-docs: docs/skopeo.1 - install -d -m 0755 ${MANINSTALLDIR}/man1 - install -m 644 docs/skopeo.1 ${MANINSTALLDIR}/man1/ + install -D -m 644 docs/skopeo.1 ${MANINSTALLDIR}/man1/skopeo.1 install-completions: install -m 644 -T hack/make/bash_autocomplete ${BASHINSTALLDIR}/skopeo diff --git a/default-policy.json b/default-policy.json new file mode 100644 index 00000000..a4c2e1f9 --- /dev/null +++ b/default-policy.json @@ -0,0 +1,7 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ] +} \ No newline at end of file diff --git a/hack/make/test-integration b/hack/make/test-integration index ac9704d4..564438f1 100755 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -9,7 +9,7 @@ bundle_test_integration() { # subshell so that we can export PATH without breaking other things ( make binary-local - make install-binary + make install export GO15VENDOREXPERIMENT=1 bundle_test_integration ) 2>&1