From 5c217c2f6be2a094f620bd7cc7ffe936d98c4b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=B6lzel=2C=20Markus?= Date: Tue, 15 Jun 2021 12:41:41 +0200 Subject: [PATCH] Remove seccomp.json Upstream change https://github.com/containers/common/pull/604. --- Dockerfile | 3 +-- Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a23d857..ee631cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,8 +124,7 @@ RUN set -ex; \ echo 'podman:100000:65536' > /etc/subuid; \ echo 'podman:100000:65536' > /etc/subgid; \ ln -s /usr/local/bin/podman /usr/bin/docker; \ - mkdir -p /podman/.local/share/containers/storage /var/lib/containers/storage /usr/share/containers; \ - wget -O /usr/share/containers/seccomp.json https://src.fedoraproject.org/rpms/containers-common/raw/rawhide/f/seccomp.json ; \ + mkdir -p /podman/.local/share/containers/storage /var/lib/containers/storage; \ chown -R podman:podman /podman; \ mkdir -m1777 /.local /.config /.cache; \ podman --help >/dev/null; \ diff --git a/Makefile b/Makefile index 6de5a6b..edc8313 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ tar: .podman-from-container .podman-from-container: podman rm -rf $(BUILD_DIR) - mkdir -p $(BUILD_DIR)/etc $(BUILD_DIR)/usr/local/bin $(BUILD_DIR)/usr/libexec $(BUILD_DIR)/usr/share/containers + mkdir -p $(BUILD_DIR)/etc $(BUILD_DIR)/usr/local/bin $(BUILD_DIR)/usr/libexec cp -r conf/containers $(BUILD_DIR)/etc/containers cp -r conf/cni $(BUILD_DIR)/etc/cni cp README.md $(BUILD_DIR)/ @@ -72,7 +72,6 @@ tar: .podman-from-container done; \ $(DOCKER) cp $$CONTAINER:/usr/libexec/podman $(BUILD_DIR)/usr/libexec/podman; \ $(DOCKER) cp $$CONTAINER:/usr/libexec/cni $(BUILD_DIR)/usr/libexec/cni; \ - $(DOCKER) cp $$CONTAINER:/usr/share/containers/seccomp.json $(BUILD_DIR)/usr/share/containers/seccomp.json; \ $(DOCKER) rm $$CONTAINER signed-tar: tar .gpg