mirror of
https://github.com/containers/skopeo.git
synced 2025-09-19 08:51:53 +00:00
Migrating default-policy.json and default.yaml to containers/common
All major distros (Fedora, debian, archlinux, gentoo, alpine, opensuse) are placing these 2 files in containers-common package. Why not fix it upstream? 1st step towards addressing https://github.com/containers/skopeo/issues/2170 Signed-off-by: Rahil Bhimjiani <me@rahil.website>
This commit is contained in:
committed by
Rahil Bhimjiani
parent
e39efb10e1
commit
6b731654ee
@@ -160,6 +160,7 @@ ostree-rs-ext_task:
|
|||||||
- dnf builddep -y skopeo
|
- dnf builddep -y skopeo
|
||||||
- make
|
- make
|
||||||
- make install
|
- make install
|
||||||
|
- echo '{"default":[{"type":"insecureAcceptAnything"}],"transports":{"docker-daemon":{"":[{"type":"insecureAcceptAnything"}]}}}' > /etc/containers/policy.json
|
||||||
proxy_ostree_ext_build_script:
|
proxy_ostree_ext_build_script:
|
||||||
- git clone --depth 1 $EXT_REPO $EXT_REPO_HOME
|
- git clone --depth 1 $EXT_REPO $EXT_REPO_HOME
|
||||||
- cd $EXT_REPO_HOME
|
- cd $EXT_REPO_HOME
|
||||||
|
10
Makefile
10
Makefile
@@ -5,12 +5,6 @@ export GOPROXY=https://proxy.golang.org
|
|||||||
# The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions .
|
# The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions .
|
||||||
DESTDIR ?=
|
DESTDIR ?=
|
||||||
PREFIX ?= /usr/local
|
PREFIX ?= /usr/local
|
||||||
ifeq ($(shell uname -s),FreeBSD)
|
|
||||||
CONTAINERSCONFDIR ?= /usr/local/etc/containers
|
|
||||||
else
|
|
||||||
CONTAINERSCONFDIR ?= /etc/containers
|
|
||||||
endif
|
|
||||||
REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
|
|
||||||
LOOKASIDEDIR ?= /var/lib/containers/sigstore
|
LOOKASIDEDIR ?= /var/lib/containers/sigstore
|
||||||
BINDIR ?= ${PREFIX}/bin
|
BINDIR ?= ${PREFIX}/bin
|
||||||
MANDIR ?= ${PREFIX}/share/man
|
MANDIR ?= ${PREFIX}/share/man
|
||||||
@@ -159,10 +153,6 @@ clean:
|
|||||||
|
|
||||||
install: install-binary install-docs install-completions
|
install: install-binary install-docs install-completions
|
||||||
install -d -m 755 ${DESTDIR}${LOOKASIDEDIR}
|
install -d -m 755 ${DESTDIR}${LOOKASIDEDIR}
|
||||||
install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
|
|
||||||
install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
|
|
||||||
install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
|
|
||||||
install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
|
|
||||||
|
|
||||||
install-binary: bin/skopeo
|
install-binary: bin/skopeo
|
||||||
install -d -m 755 ${DESTDIR}${BINDIR}
|
install -d -m 755 ${DESTDIR}${BINDIR}
|
||||||
|
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"default": [
|
|
||||||
{
|
|
||||||
"type": "insecureAcceptAnything"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"transports":
|
|
||||||
{
|
|
||||||
"docker-daemon":
|
|
||||||
{
|
|
||||||
"": [{"type":"insecureAcceptAnything"}]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
28
default.yaml
28
default.yaml
@@ -1,28 +0,0 @@
|
|||||||
# This is a default registries.d configuration file. You may
|
|
||||||
# add to this file or create additional files in registries.d/.
|
|
||||||
#
|
|
||||||
# lookaside: for reading/writing simple signing signatures
|
|
||||||
# lookaside-staging: for writing simple signing signatures, preferred over lookaside
|
|
||||||
#
|
|
||||||
# lookaside and lookaside-staging take a value of the following:
|
|
||||||
# lookaside: {schema}://location
|
|
||||||
#
|
|
||||||
# For reading signatures, schema may be http, https, or file.
|
|
||||||
# For writing signatures, schema may only be file.
|
|
||||||
|
|
||||||
# The default locations are built-in, for both reading and writing:
|
|
||||||
# /var/lib/containers/sigstore for root, or
|
|
||||||
# ~/.local/share/containers/sigstore for non-root users.
|
|
||||||
default-docker:
|
|
||||||
# lookaside: https://…
|
|
||||||
# lookaside-staging: file:///…
|
|
||||||
|
|
||||||
# The 'docker' indicator here is the start of the configuration
|
|
||||||
# for docker registries.
|
|
||||||
#
|
|
||||||
# docker:
|
|
||||||
#
|
|
||||||
# privateregistry.com:
|
|
||||||
# lookaside: https://privateregistry.com/sigstore/
|
|
||||||
# lookaside-staging: /mnt/nfs/privateregistry/sigstore
|
|
||||||
|
|
Reference in New Issue
Block a user