Skip to content

Commit 6b73165

Browse files
Rahil Bhimjianirahilarious
authored andcommitted
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 containers#2170 Signed-off-by: Rahil Bhimjiani <[email protected]>
1 parent e39efb1 commit 6b73165

File tree

4 files changed

+1
-52
lines changed

4 files changed

+1
-52
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ ostree-rs-ext_task:
160160
- dnf builddep -y skopeo
161161
- make
162162
- make install
163+
- echo '{"default":[{"type":"insecureAcceptAnything"}],"transports":{"docker-daemon":{"":[{"type":"insecureAcceptAnything"}]}}}' > /etc/containers/policy.json
163164
proxy_ostree_ext_build_script:
164165
- git clone --depth 1 $EXT_REPO $EXT_REPO_HOME
165166
- cd $EXT_REPO_HOME

Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ export GOPROXY=https://proxy.golang.org
55
# The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions .
66
DESTDIR ?=
77
PREFIX ?= /usr/local
8-
ifeq ($(shell uname -s),FreeBSD)
9-
CONTAINERSCONFDIR ?= /usr/local/etc/containers
10-
else
11-
CONTAINERSCONFDIR ?= /etc/containers
12-
endif
13-
REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
148
LOOKASIDEDIR ?= /var/lib/containers/sigstore
159
BINDIR ?= ${PREFIX}/bin
1610
MANDIR ?= ${PREFIX}/share/man
@@ -159,10 +153,6 @@ clean:
159153

160154
install: install-binary install-docs install-completions
161155
install -d -m 755 ${DESTDIR}${LOOKASIDEDIR}
162-
install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
163-
install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
164-
install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
165-
install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
166156

167157
install-binary: bin/skopeo
168158
install -d -m 755 ${DESTDIR}${BINDIR}

default-policy.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

default.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)