Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
This commit is contained in:
Daniel J Walsh
parent
ef305af98c
commit
72bc87fefa
@ -6,16 +6,16 @@
|
||||
%global skopeo_branch master
|
||||
%global podman_branch master
|
||||
%global image_branch master
|
||||
%global common_branch master
|
||||
%global storage_branch master
|
||||
%global shortnames_branch master
|
||||
%global common_branch main
|
||||
%global storage_branch main
|
||||
%global shortnames_branch main
|
||||
|
||||
%global github_containers https://raw.githubusercontent.com/containers
|
||||
|
||||
Epoch: 4
|
||||
Name: containers-common
|
||||
Version: 1
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
Summary: Common configuration and documentation for containers
|
||||
License: ASL 2.0
|
||||
BuildArch: noarch
|
||||
@ -38,7 +38,7 @@ Source10: %{github_containers}/image/%{image_branch}/docs/containers-registries.
|
||||
Source11: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
|
||||
Source12: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
|
||||
Source13: %{github_containers}/image/%{image_branch}/registries.conf
|
||||
Source14: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
|
||||
Source14: %{github_containers}/common/%{common_branch}/docs/containers-mounts.conf.5.md
|
||||
Source15: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
|
||||
Source16: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
|
||||
Source17: %{github_containers}/skopeo/%{skopeo_branch}/default-policy.json
|
||||
@ -136,6 +136,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
|
||||
%{_datadir}/rhel/secrets/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19
|
||||
- Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
|
||||
|
||||
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
|
||||
- Update containers.conf to latest, and change default log-driver to journald.
|
||||
|
||||
|
||||
@ -87,6 +87,9 @@ The `storage.options` table supports the following options:
|
||||
**auto-userns-max-size**=65536
|
||||
Auto-userns-max-size is the maximum size for a user namespace created automatically.
|
||||
|
||||
**disable-volatile**=true
|
||||
If disable-volatile is set, then the "volatile" mount optimization is disabled for all the containers.
|
||||
|
||||
### STORAGE OPTIONS FOR AUFS TABLE
|
||||
|
||||
The `storage.options.aufs` table supports the following options:
|
||||
|
||||
@ -166,6 +166,12 @@ log_driver = "journald"
|
||||
#
|
||||
# log_size_max = -1
|
||||
|
||||
# Specifies default format tag for container log messages.
|
||||
# This is useful for creating a specific tag for container log messages.
|
||||
# Containers logs default to truncated container ID as a tag.
|
||||
#
|
||||
# log_tag = ""
|
||||
|
||||
# Default way to to create a Network namespace for the container
|
||||
# Options are:
|
||||
# `private` Create private Network Namespace for the container.
|
||||
@ -190,6 +196,9 @@ log_driver = "journald"
|
||||
#
|
||||
# pidns = "private"
|
||||
|
||||
# Indicates the networking to be used for rootless containers
|
||||
# rootless_networking="slirp4netns"
|
||||
|
||||
# Path to the seccomp.json profile which is used as the default seccomp profile
|
||||
# for the runtime.
|
||||
#
|
||||
@ -494,3 +503,9 @@ log_driver = "journald"
|
||||
# TOML does not provide a way to end a table other than a further table being
|
||||
# defined, so every key hereafter will be part of [volume_plugins] and not the
|
||||
# main config.
|
||||
|
||||
[secret]
|
||||
# driver="file"
|
||||
|
||||
[secret.opts]
|
||||
# root = "/example/directory"
|
||||
|
||||
@ -175,7 +175,7 @@ the container.
|
||||
|
||||
Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.
|
||||
|
||||
**log_driver**="journald"
|
||||
**log_driver**="k8s-file"
|
||||
|
||||
Logging driver for the container. Available options: `k8s-file` and `journald`.
|
||||
|
||||
@ -186,6 +186,10 @@ that no size limit is imposed. If it is positive, it must be >= 8192 to
|
||||
match/exceed conmon's read buffer. The file is truncated and re-opened so the
|
||||
limit is never exceeded.
|
||||
|
||||
**log_tag**=""
|
||||
|
||||
Default format tag for container log messages. This is useful for creating a specific tag for container log messages. Container log messages default to using the truncated container ID as a tag.
|
||||
|
||||
**netns**="private"
|
||||
|
||||
Default way to to create a NET namespace for the container.
|
||||
@ -211,6 +215,11 @@ Options are:
|
||||
Maximum number of processes allowed in a container. 0 indicates that no limit
|
||||
is imposed.
|
||||
|
||||
**rootless_networking**="slirp4netns"
|
||||
|
||||
Set type of networking rootless containers should use. Valid options are `slirp4netns`
|
||||
or `cni`.
|
||||
|
||||
**seccomp_profile**="/usr/share/containers/seccomp.json"
|
||||
|
||||
Path to the seccomp.json profile which is used as the default seccomp profile
|
||||
@ -510,6 +519,21 @@ used as the backend for Podman named volumes. Individual plugins are specified
|
||||
below, as a map of the plugin name (what the plugin will be called) to its path
|
||||
(filepath of the plugin's unix socket).
|
||||
|
||||
|
||||
## SECRET TABLE
|
||||
The `secret` table contains settings for the configuration of the secret subsystem.
|
||||
|
||||
**driver**=file
|
||||
|
||||
Name of the secret driver to be used.
|
||||
Currently valid values are:
|
||||
* file
|
||||
* pass
|
||||
|
||||
**opts**={}
|
||||
|
||||
The driver specific options object.
|
||||
|
||||
# FILES
|
||||
|
||||
**containers.conf**
|
||||
|
||||
@ -132,6 +132,7 @@
|
||||
"ftruncate",
|
||||
"ftruncate64",
|
||||
"futex",
|
||||
"futex_time64",
|
||||
"futimesat",
|
||||
"get_robust_list",
|
||||
"get_thread_area",
|
||||
@ -216,7 +217,9 @@
|
||||
"mq_notify",
|
||||
"mq_open",
|
||||
"mq_timedreceive",
|
||||
"mq_timedreceive_time64",
|
||||
"mq_timedsend",
|
||||
"mq_timedsend_time64",
|
||||
"mq_unlink",
|
||||
"mremap",
|
||||
"msgctl",
|
||||
@ -263,6 +266,7 @@
|
||||
"recv",
|
||||
"recvfrom",
|
||||
"recvmmsg",
|
||||
"recvmmsg_time64",
|
||||
"recvmsg",
|
||||
"remap_file_pages",
|
||||
"removexattr",
|
||||
@ -278,6 +282,7 @@
|
||||
"rt_sigreturn",
|
||||
"rt_sigsuspend",
|
||||
"rt_sigtimedwait",
|
||||
"rt_sigtimedwait_time64",
|
||||
"rt_tgsigqueueinfo",
|
||||
"sched_get_priority_max",
|
||||
"sched_get_priority_min",
|
||||
@ -286,6 +291,7 @@
|
||||
"sched_getparam",
|
||||
"sched_getscheduler",
|
||||
"sched_rr_get_interval",
|
||||
"sched_rr_get_interval_time64",
|
||||
"sched_setaffinity",
|
||||
"sched_setattr",
|
||||
"sched_setparam",
|
||||
@ -297,6 +303,7 @@
|
||||
"semget",
|
||||
"semop",
|
||||
"semtimedop",
|
||||
"semtimedop_time64",
|
||||
"send",
|
||||
"sendfile",
|
||||
"sendfile64",
|
||||
|
||||
@ -61,3 +61,5 @@
|
||||
"busybox" = "docker.io/library/busybox"
|
||||
# php
|
||||
"php" = "docker.io/library/php"
|
||||
#python
|
||||
"python" = "docker.io/library/python"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user