Skip to content

Commit 492ab56

Browse files
author
Rahil Bhimjiani
committed
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 8514ab3 commit 492ab56

File tree

3 files changed

+0
-52
lines changed

3 files changed

+0
-52
lines changed

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
@@ -160,10 +154,6 @@ clean:
160154

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

168158
install-binary: bin/skopeo
169159
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)