Skip to content

Commit

Permalink
Remove seccomp.json
Browse files Browse the repository at this point in the history
Upstream change containers/common#604.
  • Loading branch information
MarkusSchoelzel committed Jun 15, 2021
1 parent 68ab471 commit 5c217c2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)/
Expand All @@ -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
Expand Down

0 comments on commit 5c217c2

Please sign in to comment.