Skip to content

Commit

Permalink
Merge pull request #620 from rhatdan/config
Browse files Browse the repository at this point in the history
Fix spacing on name value pairs to be consistent
  • Loading branch information
openshift-merge-robot authored Jun 14, 2021
2 parents c46fab6 + b26dd49 commit db86400
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions pkg/config/containers.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[containers]

# List of annotation. Specified as
# "key=value"
# "key = value"
# If it is empty or commented out, no annotations will be added
#
# annotations = []
Expand Down Expand Up @@ -190,7 +190,7 @@ default_sysctls = [
# pids_limit = 2048

# Indicates the networking to be used for rootless containers
# rootless_networking="slirp4netns"
# rootless_networking = "slirp4netns"

# Path to the seccomp.json profile which is used as the default seccomp profile
# for the runtime.
Expand All @@ -211,7 +211,7 @@ default_sysctls = [

# Set umask inside the container
#
# umask="0022"
# umask = "0022"

# Default way to to create a User namespace for the container
# Options are:
Expand All @@ -224,7 +224,7 @@ default_sysctls = [
# UIDs are allocated from the "container" UIDs listed in
# /etc/subuid & /etc/subgid
#
# userns_size=65536
# userns_size = 65536

# Default way to to create a UTS namespace for the container
# Options are:
Expand Down Expand Up @@ -333,7 +333,7 @@ default_sysctls = [

# Maximum number of image layers to be copied (pulled/pushed) simultaneously.
# Not setting this field, or setting it to zero, will fall back to containers/image defaults.
# image_parallel_copies=0
# image_parallel_copies = 0

# Default command to run the infra container
#
Expand All @@ -357,7 +357,7 @@ default_sysctls = [
# Indicates if Podman is running inside a VM via Podman Machine.
# Podman uses this value to do extra setup around networking from the
# container inside the VM to to host.
# machine_enabled=false
# machine_enabled = false

# MultiImageArchive - if true, the container engine allows for storing archives
# (e.g., of the docker-archive transport) with multiple images. By default,
Expand All @@ -376,12 +376,12 @@ default_sysctls = [

# Path to the slirp4netns binary
#
# network_cmd_path=""
# network_cmd_path = ""

# Default options to pass to the slirp4netns binary.
# For example "allow_host_loopback=true"
#
# network_cmd_options=[]
# network_cmd_options = []

# Whether to use chroot instead of pivot_root in the runtime
#
Expand Down Expand Up @@ -437,7 +437,7 @@ default_sysctls = [
# rootfull "unix://run/podman/podman.sock (Default)
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
# remote rootfull ssh://[email protected]:22/run/podman/podman.sock
# uri="ssh://[email protected]/run/user/1001/podman/podman.sock"
# uri = "ssh://[email protected]/run/user/1001/podman/podman.sock"
# Path to file containing ssh identity key
# identity = "~/.ssh/id_rsa"

Expand Down Expand Up @@ -505,7 +505,7 @@ default_sysctls = [
# main config.

[secret]
# driver="file"
# driver = "file"

[secret.opts]
# root = "/example/directory"

0 comments on commit db86400

Please sign in to comment.