Update configuration files in containers-common

Update configuration files in containers-storage

containers-storage.conf.5.md

@@ -138,6 +138,9 @@ The `storage.options.thinpool` table supports the following options for the `dev
     6: LogLevelInfo
     7: LogLevelDebug
 
+**metadata_size**=""
+  metadata_size is used to set the `pvcreate --metadatasize` options when creating thin devices. (Default 128k)
+
 **min_free_space**=""
   Specifies the min free space percent in a thin pool required for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables. (default: 10%)
 

containers.conf

@@ -122,12 +122,6 @@
 #
 # env_host = false
 
-# Path to OCI hooks directories for automatically executed hooks.
-#
-# hooks_dir = [
-#     "/usr/share/containers/oci/hooks.d",
-# ]
-
 # Default proxy environment variables passed into the container.
 # The environment variables passed in include:
 # http_proxy, https_proxy, ftp_proxy, no_proxy, and the upper case versions of
@@ -205,6 +199,15 @@
 #
 # shm_size = "65536k"
 
+# Set timezone in container. Takes IANA timezones as well as "local",
+# which sets the timezone in the container to match the host machine.
+#
+# tz = ""
+
+# Set umask inside the container
+#
+# umask="0022"
+
 # Default way to to create a UTS namespace for the container
 # Options are:
 # `private`        Create private UTS Namespace for the container.
@@ -279,11 +282,23 @@
 #
 # enable_port_reservation = true
 
+# Environment variables to be used when running the container engine (e.g., Podman, Buildah).
+# For example "http_proxy=internal.proxy.company.com".
+# Note these environment variables will not be used within the container.
+# Set the env section under [containers] table, if you want to set environment variables for the container.
+# env = []
+
 # Selects which logging mechanism to use for container engine events.
 # Valid values are `journald`, `file` and `none`.
 #
 # events_logger = "journald"
 
+# Path to OCI hooks directories for automatically executed hooks.
+#
+# hooks_dir = [
+#     "/usr/share/containers/oci/hooks.d",
+# ]
+
 # Default transport method for pulling and pushing for images
 #
 # image_default_transport = "docker://"
@@ -316,6 +331,10 @@
 #
 # namespace = ""
 
+# NetworkCmdPath is the path to the slirp4netns binary
+#
+# network_cmd_path=""
+
 # Whether to use chroot instead of pivot_root in the runtime
 #
 # no_pivot_root = false
@@ -329,14 +348,6 @@
 # Whether to pull new image before running a container
 # pull_policy = "missing"
 
-# Default Remote URI to access the Podman service.
-# Examples:
-#  rootless "unix://run/user/$UID/podman/podman.sock" (Default)
-#  rootfull "unix://run/podman/podman.sock.(Default)
-#  remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
-#  remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
-# remote_uri= ""
-
 # Directory for persistent engine files (database, etc)
 # By default, this will be configured relative to where the containers/storage
 # stores containers
@@ -375,6 +386,22 @@
 # Number of seconds to wait for container to exit before sending kill signal.
 # stop_timeout = 10
 
+# Index to the active service
+# active_service = production
+
+# map of service destinations
+# [service_destinations]
+#   [service_destinations.production]
+#     URI to access the Podman service
+#     Examples:
+#       rootless "unix://run/user/$UID/podman/podman.sock" (Default)
+#       rootfull "unix://run/podman/podman.sock (Default)
+#       remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
+#       remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
+#     uri="ssh://user@production.example.com/run/user/1001/podman/podman.sock"
+#     Path to file containing ssh identity key
+#     identity = "~/.ssh/id_rsa"
+
 # Paths to look for a valid OCI runtime (runc, runv, kata, etc)
 [engine.runtimes]
 # runc = [

containers.conf.5.md

@@ -125,9 +125,6 @@ environment variables to the container.
 **env_host**=false
   Pass all host environment variables into the container.
 
-**hooks_dir**=["/etc/containers/oci/hooks.d", ...]
-  Path to the OCI hooks directories for automatically executed hooks.
-
 **http_proxy**=false
   Default proxy environment variables will be passed into the container.
   The environment variables passed in include:
@@ -195,6 +192,16 @@ than `0`.
 If you omit the unit, the system uses bytes. If you omit the size entirely,
 the system uses `65536k`.
 
+**tz=**""
+  Set timezone in container. Takes IANA timezones as well as `local`, which sets the timezone in the container to match the host machine.
+  If not set, then containers will run with the time zone specified in the image. 
+  Examples:
+    `tz="local"`
+    `tz="America/New_York"`
+
+**umask**="0022"
+  Sets umask inside the container.
+
 **utsns**="private"
   Default way to to create a UTS namespace for the container.
   Options are:
@@ -271,10 +278,18 @@ they cannot be reused by other programs on the host. However, this can cause
 significant memory usage if a container has many ports forwarded to it.
 Disabling this can save memory.
 
+**env**=[]
+Environment variables to be used when running the container engine (e.g., Podman, Buildah).  For example "http_proxy=internal.proxy.company.com".
+Note these environment variables will not be used within the container. Set the env section under [containers] table,
+if you want to set environment variables for the container.
+
 **events_logger**="journald"
   Default method to use when logging events.
   Valid values: `file`, `journald`, and `none`.
 
+**hooks_dir**=["/etc/containers/oci/hooks.d", ...]
+  Path to the OCI hooks directories for automatically executed hooks.
+
 **image_default_transport**="docker://"
   Default transport method for pulling and pushing images.
 
@@ -301,6 +316,9 @@ create new containers and pods in that namespace.  The default namespace is "",
  which corresponds to no namespace. When no namespace is set, all containers
 and pods are visible.
 
+**network_cmd_path**=""
+  NetworkCmdPath is the path to the slirp4netns binary.
+
 **no_pivot_root**=false
   Whether to use chroot instead of pivot_root in the runtime.
 
@@ -310,6 +328,24 @@ pod consumes one lock.  The default number available is 2048.  If this is
 changed, a lock renumbering must be performed, using the
 `podman system renumber` command.
 
+**active_service**=""
+  Name of destination for accessing the Podman service.
+
+**[service_destinations]**
+
+**[service_destinations.{name}]**
+  **uri="ssh://user@production.example.com/run/user/1001/podman/podman.sock"**
+
+    Example URIs:
+
+- **rootless local**  - unix://run/user/1000/podman/podman.sock
+- **rootless remote** - ssh://user@engineering.lab.company.com/run/user/1000/podman/podman.sock
+- **rootfull local**  - unix://run/podman/podman.sock
+- **rootfull remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock
+
+  **identity="~/.ssh/id_rsa**
+    Path to file containing ssh identity key
+
 **pull_policy**="always"|"missing"|"never"
 Pull image before running or creating a container. The default is **missing**.
 

skopeo.spec

@@ -46,7 +46,7 @@ Epoch: 1
 Epoch: 2
 %endif
 Version: 1.1.1
-Release: 23.dev.git%{shortcommit0}%{?dist}
+Release: 24.dev.git%{shortcommit0}%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -439,6 +439,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Sun Aug 2 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-23.dev.git62fd5a7
+- Update configuration files in containers-common
+- Update configuration files in containers-storage
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-23.dev.git62fd5a7
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild