From b114829e8d0964fbf7f3d1e6514600dc2910aee9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 11 Aug 2023 05:31:57 -0400 Subject: [PATCH] local build --- containers-registries.conf.5.md | 13 ++++++------ containers.conf | 32 ++++++++++++++++++++++++++-- containers.conf.5.md | 37 ++++++++++++++++++++++++++++++++- registries.conf | 10 ++++----- 4 files changed, 78 insertions(+), 14 deletions(-) diff --git a/containers-registries.conf.5.md b/containers-registries.conf.5.md index fdc2fa9..0263b79 100644 --- a/containers-registries.conf.5.md +++ b/containers-registries.conf.5.md @@ -73,16 +73,16 @@ internet without having to change `Dockerfile`s, or to add redundancy). : Accepts the same format as the `prefix` field, and specifies the physical location of the `prefix`-rooted namespace. -By default, this equal to `prefix` (in which case `prefix` can be omitted and the +By default, this is equal to `prefix` (in which case `prefix` can be omitted and the `[[registry]]` TOML table can only specify `location`). Example: Given ``` prefix = "example.com/foo" -location = "internal-registry-for-example.net/bar" +location = "internal-registry-for-example.com/bar" ``` requests for the image `example.com/foo/myimage:latest` will actually work with the -`internal-registry-for-example.net/bar/myimage:latest` image. +`internal-registry-for-example.com/bar/myimage:latest` image. With a `prefix` containing a wildcard in the format: "*.example.com" for subdomain matching, the location can be empty. In such a case, @@ -127,8 +127,9 @@ Referencing an image by digest ensures that the same is always used different images if the tag mapping is out of sync). -*Note*: Redirection and mirrors are currently processed only when reading images, not when pushing -to a registry; that may change in the future. +*Note*: Redirection and mirrors are currently processed only when reading a single image, +not when pushing to a registry nor when doing any other kind of lookup/search on a on a registry. +This may change in the future. #### Short-Name Aliasing The use of unqualified-search registries entails an ambiguity as it is @@ -247,7 +248,7 @@ Given the above, a pull of `example.com/foo/image:latest` will try: 1. `example-mirror-0.local/mirror-for-foo/image:latest` 2. `example-mirror-1.local/mirrors/foo/image:latest` -3. `internal-registry-for-example.net/bar/image:latest` +3. `internal-registry-for-example.com/bar/image:latest` in order, and use the first one that exists. diff --git a/containers.conf b/containers.conf index f1970ab..6da9de2 100644 --- a/containers.conf +++ b/containers.conf @@ -119,7 +119,6 @@ default_sysctls = [ # #env = [ # "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", -# "TERM=xterm", #] # Pass all host environment variables into the container. @@ -196,6 +195,13 @@ log_driver = "journald" # #log_tag = "" +# List of mounts. Specified as +# "type=TYPE,source=,destination=,", for example: +# "type=bind,source=/var/lib/foobar,destination=/var/lib/foobar,ro". +# If it is empty or commented out, no mounts will be added +# +#mounts = [] + # Default way to to create a Network namespace for the container # Options are: # `private` Create private Network Namespace for the container. @@ -276,7 +282,7 @@ log_driver = "journald" # If it is empty or commented out, no volumes will be added # #volumes = [] -# + #[engine.platform_to_oci_runtime] #"wasi/wasm" = ["crun-wasm"] #"wasi/wasm32" = ["crun-wasm"] @@ -376,6 +382,20 @@ log_driver = "journald" # #active_service = "production" +# Enforces using docker.io for completing short names in Podman's compatibility +# REST API. Note that this will ignore unqualified-search-registries and +# short-name aliases defined in containers-registries.conf(5). +#compat_api_enforce_docker_hub = true + +# Specify one or more external providers for the compose command. The first +# found provider is used for execution. Can be an absolute and relative path +# or a (file) name. +#compose_providers=[] + +# Emit logs on each invocation of the compose command indicating that an +# external compose provider is being executed. +#compose_warning_logs = true + # The compression format to use when pushing an image. # Valid options are: `gzip`, `zstd` and `zstd:chunked`. # @@ -778,3 +798,11 @@ 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 [machine] and not the # main config. + +[farms] +# +# the default farm to use when farming out builds +# default = "" +# +# map of existing farms +#[farms.list] diff --git a/containers.conf.5.md b/containers.conf.5.md index a9666b7..00112c3 100644 --- a/containers.conf.5.md +++ b/containers.conf.5.md @@ -151,7 +151,7 @@ A list of dns servers to override the DNS configuration passed to the container. The special value “none” can be specified to disable creation of /etc/resolv.conf in the container. -**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "TERM=xterm"] +**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"] Environment variable list for the container process, used for passing environment variables to the container. @@ -229,6 +229,13 @@ limit is never exceeded. 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. +**mounts**=[] + +List of mounts. +Specified as "type=TYPE,source=,destination=," + +Example: [ "type=bind,source=/var/lib/foobar,destination=/var/lib/foobar,ro", ] + **netns**="private" Default way to to create a NET namespace for the container. @@ -422,6 +429,23 @@ Name of destination for accessing the Podman service. See SERVICE DESTINATION TA The cgroup management implementation used for the runtime. Supports `cgroupfs` and `systemd`. +**compat_api_enforce_docker_hub**=true + +Enforce using docker.io for completing short names in Podman's compatibility +REST API. Note that this will ignore unqualified-search-registries and +short-name aliases defined in containers-registries.conf(5). + +**compose_providers**=[] + +Specify one or more external providers for the compose command. The first +found provider is used for execution. Can be an absolute and relative path or +a (file) name. + +**compose_warning_logs**=true + +Emit logs on each invocation of the compose command indicating that an external +compose provider is being executed. + **conmon_env_vars**=[] Environment variables to pass into Conmon. @@ -824,6 +848,17 @@ Virtualization provider to be used for running a podman-machine VM. Empty value is interpreted as the default provider for the current host OS. On Linux/Mac default is `QEMU` and on Windows it is `WSL`. +## FARMS TABLE +The `farms` table contains configuration options used to group up remote connections into farms that will be used when sending out builds to different machines in a farm via `podman buildfarm`. + +**default**="" + +The default farm to use when farming out builds. + +**[farms.list]** + +Map of farms created where the key is the farm name and the value is the list of system connections. + # FILES **containers.conf** diff --git a/registries.conf b/registries.conf index a9badc2..9bee379 100644 --- a/registries.conf +++ b/registries.conf @@ -24,7 +24,7 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access. # # The "prefix" field is used to choose the relevant [[registry]] TOML table; # # (only) the TOML table with the longest match for the input image name # # (taking into account namespace/repo/tag/digest separators) is used. -# # +# # # # The prefix can also be of the form: *.example.com for wildcard subdomain # # matching. # # @@ -45,11 +45,11 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access. # # # # Example: Given # # prefix = "example.com/foo" -# # location = "internal-registry-for-example.net/bar" +# # location = "internal-registry-for-example.com/bar" # # requests for the image example.com/foo/myimage:latest will actually work with the -# # internal-registry-for-example.net/bar/myimage:latest image. +# # internal-registry-for-example.com/bar/myimage:latest image. # -# # The location can be empty iff prefix is in a +# # The location can be empty if prefix is in a # # wildcarded format: "*.example.com". In this case, the input reference will # # be used as-is without any rewrite. # location = internal-registry-for-example.com/bar" @@ -73,7 +73,7 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access. # # Given the above, a pull of example.com/foo/image:latest will try: # # 1. example-mirror-0.local/mirror-for-foo/image:latest # # 2. example-mirror-1.local/mirrors/foo/image:latest -# # 3. internal-registry-for-example.net/bar/image:latest +# # 3. internal-registry-for-example.com/bar/image:latest # # in order, and use the first one that exists. short-name-mode="enforcing"