diff options
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/container-registry/container-oci-registry-config.bb | 8 | ||||
| -rw-r--r-- | recipes-containers/container-registry/docker-registry-config.bb | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/recipes-containers/container-registry/container-oci-registry-config.bb b/recipes-containers/container-registry/container-oci-registry-config.bb index ee6760f4..ba8cf4c3 100644 --- a/recipes-containers/container-registry/container-oci-registry-config.bb +++ b/recipes-containers/container-registry/container-oci-registry-config.bb | |||
| @@ -22,16 +22,18 @@ | |||
| 22 | # | 22 | # |
| 23 | # IMPORTANT: This recipe: | 23 | # IMPORTANT: This recipe: |
| 24 | # - Does NOT modify docker-distribution or container-host-config | 24 | # - Does NOT modify docker-distribution or container-host-config |
| 25 | # - Does NOT install automatically - user must add to IMAGE_INSTALL | ||
| 26 | # - Does NOT clobber public registry access (docker.io, quay.io, etc.) | 25 | # - Does NOT clobber public registry access (docker.io, quay.io, etc.) |
| 27 | # - Uses drop-in files in /etc/containers/registries.conf.d/ | 26 | # - Uses drop-in files in /etc/containers/registries.conf.d/ |
| 28 | # - Skips entirely if CONTAINER_REGISTRY_URL is not set | 27 | # - Skips entirely if CONTAINER_REGISTRY_URL is not set |
| 29 | # | 28 | # |
| 30 | # Usage: | 29 | # Usage: |
| 31 | # # In local.conf or image recipe - BOTH required: | 30 | # # In local.conf or image recipe: |
| 32 | # CONTAINER_REGISTRY_URL = "localhost:5000" | 31 | # CONTAINER_REGISTRY_URL = "localhost:5000" |
| 33 | # CONTAINER_REGISTRY_INSECURE = "1" | 32 | # CONTAINER_REGISTRY_INSECURE = "1" |
| 34 | # IMAGE_INSTALL:append = " container-oci-registry-config" | 33 | # IMAGE_FEATURES += "container-registry" |
| 34 | # | ||
| 35 | # The IMAGE_FEATURES mechanism auto-selects this recipe for Podman/CRI-O | ||
| 36 | # or docker-registry-config for Docker based on VIRTUAL-RUNTIME_container_engine. | ||
| 35 | # | 37 | # |
| 36 | # =========================================================================== | 38 | # =========================================================================== |
| 37 | 39 | ||
diff --git a/recipes-containers/container-registry/docker-registry-config.bb b/recipes-containers/container-registry/docker-registry-config.bb index eee74c98..cbe2e13f 100644 --- a/recipes-containers/container-registry/docker-registry-config.bb +++ b/recipes-containers/container-registry/docker-registry-config.bb | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | # This config only handles insecure registry trust. | 20 | # This config only handles insecure registry trust. |
| 21 | # | 21 | # |
| 22 | # IMPORTANT: This recipe: | 22 | # IMPORTANT: This recipe: |
| 23 | # - Does NOT install automatically - user must add to IMAGE_INSTALL | ||
| 24 | # - Skips entirely if DOCKER_REGISTRY_INSECURE is not set | 23 | # - Skips entirely if DOCKER_REGISTRY_INSECURE is not set |
| 25 | # - Creates /etc/docker/daemon.json (will be merged if docker recipe | 24 | # - Creates /etc/docker/daemon.json (will be merged if docker recipe |
| 26 | # also creates one, or may need RCONFLICTS handling) | 25 | # also creates one, or may need RCONFLICTS handling) |
| @@ -28,7 +27,11 @@ | |||
| 28 | # Usage: | 27 | # Usage: |
| 29 | # # In local.conf or image recipe: | 28 | # # In local.conf or image recipe: |
| 30 | # DOCKER_REGISTRY_INSECURE = "10.0.2.2:5000 myregistry.local:5000" | 29 | # DOCKER_REGISTRY_INSECURE = "10.0.2.2:5000 myregistry.local:5000" |
| 31 | # IMAGE_INSTALL:append = " docker-registry-config" | 30 | # IMAGE_FEATURES += "container-registry" |
| 31 | # | ||
| 32 | # The IMAGE_FEATURES mechanism auto-selects this recipe for Docker | ||
| 33 | # or container-oci-registry-config for Podman/CRI-O based on | ||
| 34 | # VIRTUAL-RUNTIME_container_engine. | ||
| 32 | # | 35 | # |
| 33 | # =========================================================================== | 36 | # =========================================================================== |
| 34 | 37 | ||
