Skip to content

Commit

Permalink
Migrating default-policy.json and default.yaml to containers/common
Browse files Browse the repository at this point in the history
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 <me@rahil.website>
  • Loading branch information
Rahil Bhimjiani committed Dec 1, 2023
1 parent 8514ab3 commit 441249f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 52 deletions.
1 change: 1 addition & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ ostree-rs-ext_task:
- dnf builddep -y skopeo
- make
- make install
- echo '{"default":[{"type":"insecureAcceptAnything"}],"transports":{"docker-daemon":{"":[{"type":"insecureAcceptAnything"}]}}}' > /etc/containers/policy.json
proxy_ostree_ext_build_script:
- git clone --depth 1 $EXT_REPO $EXT_REPO_HOME
- cd $EXT_REPO_HOME
Expand Down
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
DESTDIR ?=
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
BINDIR ?= ${PREFIX}/bin
MANDIR ?= ${PREFIX}/share/man
Expand Down Expand Up @@ -160,10 +154,6 @@ clean:

install: install-binary install-docs install-completions
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 -d -m 755 ${DESTDIR}${BINDIR}
Expand Down
14 changes: 0 additions & 14 deletions default-policy.json

This file was deleted.

28 changes: 0 additions & 28 deletions default.yaml

This file was deleted.

0 comments on commit 441249f

Please sign in to comment.