From fccb23be6eac2741ebd31dbe72702b49bcb14f11 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 11 Jan 2021 16:31:14 -0500
Subject: [PATCH] Update documentaton for containers.conf, seccomp.json and new
 shortnames.conf

---
 containers.conf.5.md | 2 +-
 seccomp.json         | 1 -
 shortnames.conf      | 9 +++++++++
 skopeo.spec          | 5 ++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/containers.conf.5.md b/containers.conf.5.md
index 6ff2b11..678eafb 100644
--- a/containers.conf.5.md
+++ b/containers.conf.5.md
@@ -142,7 +142,7 @@ environment variables to the container.
 
 Pass all host environment variables into the container.
 
-**http_proxy**=false
+**http_proxy**=true
 
 Default proxy environment variables will be passed into the container.
 The environment variables passed in include:
diff --git a/seccomp.json b/seccomp.json
index 92e1218..15876ac 100644
--- a/seccomp.json
+++ b/seccomp.json
@@ -380,7 +380,6 @@
 				"utimensat_time64",
 				"utimes",
 				"vfork",
-				"vmsplice",
 				"wait4",
 				"waitid",
 				"waitpid",
diff --git a/shortnames.conf b/shortnames.conf
index 271f374..0a336e5 100644
--- a/shortnames.conf
+++ b/shortnames.conf
@@ -16,9 +16,13 @@
   "fedora" = "registry.fedoraproject.org/fedora"
   # openSUSE
   "opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
+  "opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
+  "opensuse/tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf"
   "opensuse/leap" = "registry.opensuse.org/opensuse/leap"
   "opensuse/busybox" = "registry.opensuse.org/opensuse/busybox"
   "tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
+  "tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
+  "tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf"
   "leap" = "registry.opensuse.org/opensuse/leap"
   "tw-busybox" = "registry.opensuse.org/opensuse/busybox"
   # SUSE
@@ -40,6 +44,11 @@
   "ubi8" = "registry.access.redhat.com/ubi8"
   "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
   "ubi8-init" = "registry.access.redhat.com/ubi8-init"
+  "ubi8-micro" = "registry.access.redhat.com/ubi8-micro"
+  "ubi8/ubi" = "registry.access.redhat.com/ubi8/ubi"
+  "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal"
+  "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init"
+  "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
   # Debian
   "debian" = "docker.io/library/debian"
   # Oracle Linux
diff --git a/skopeo.spec b/skopeo.spec
index 3847266..c91fddb 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -43,7 +43,7 @@
 Name: %{repo}
 Epoch: %{conditional_epoch}
 Version: 1.2.2
-Release: 2.dev.git%{shortcommit0}%{?dist}
+Release: 3.dev.git%{shortcommit0}%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -460,6 +460,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Jan 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.2-3.dev.git2e90a8a
+- Update documentaton for containers.conf, seccomp.json and new shortnames.conf
+
 * Mon Jan 11 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.2.2-2.dev.git2e90a8a
 - bump to 1.2.2
 - autobuilt 2e90a8a