local build
This commit is contained in:
parent
102352d89a
commit
0a797de0d4
@ -183,7 +183,7 @@ default_sysctls = [
|
|||||||
|
|
||||||
# Logging driver for the container. Available options: k8s-file and journald.
|
# Logging driver for the container. Available options: k8s-file and journald.
|
||||||
#
|
#
|
||||||
log_driver = "journald"
|
#log_driver = "k8s-file"
|
||||||
|
|
||||||
# Maximum size allowed for the container log file. Negative numbers indicate
|
# Maximum size allowed for the container log file. Negative numbers indicate
|
||||||
# that no size limit is imposed. If positive, it must be >= 8192 to match or
|
# that no size limit is imposed. If positive, it must be >= 8192 to match or
|
||||||
|
@ -48,6 +48,7 @@ graphroot = "/var/lib/containers/storage"
|
|||||||
# AdditionalImageStores is used to pass paths to additional Read/Only image stores
|
# AdditionalImageStores is used to pass paths to additional Read/Only image stores
|
||||||
# Must be comma separated list.
|
# Must be comma separated list.
|
||||||
additionalimagestores = [
|
additionalimagestores = [
|
||||||
|
"/usr/lib/containers/storage",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Allows specification of how storage is populated when pulling images. This
|
# Allows specification of how storage is populated when pulling images. This
|
||||||
@ -70,7 +71,7 @@ additionalimagestores = [
|
|||||||
# Tells containers/storage where an ostree repository exists that might have
|
# Tells containers/storage where an ostree repository exists that might have
|
||||||
# previously pulled content which can be used when attempting to avoid
|
# previously pulled content which can be used when attempting to avoid
|
||||||
# pulling content from the container registry
|
# pulling content from the container registry
|
||||||
pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""}
|
pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
|
||||||
|
|
||||||
# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
|
# Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
|
||||||
# a container, to the UIDs/GIDs as they should appear outside of the container,
|
# a container, to the UIDs/GIDs as they should appear outside of the container,
|
||||||
|
@ -4,7 +4,7 @@ set -eox pipefail
|
|||||||
|
|
||||||
spectool -fg containers-common.spec
|
spectool -fg containers-common.spec
|
||||||
|
|
||||||
if [[ $(git rev-parse --abbrev-ref HEAD) == "rawhide" ]]; then
|
if [[ $(git reg-parse --abbrev-ref HEAD) == "rawhide" ]]; then
|
||||||
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
|
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
|
||||||
-e 's/^pull_options.*=.*/pull_options = {enable_partial_images = \"true\", use_hard_links = \"false\", ostree_repos=""}/' \
|
-e 's/^pull_options.*=.*/pull_options = {enable_partial_images = \"true\", use_hard_links = \"false\", ostree_repos=""}/' \
|
||||||
storage.conf
|
storage.conf
|
||||||
@ -22,7 +22,7 @@ sed -i '/\"socketcall\",/i \
|
|||||||
sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io", "quay.io"]/g' \
|
sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io", "quay.io"]/g' \
|
||||||
registries.conf
|
registries.conf
|
||||||
|
|
||||||
grep '\nshort-name-mode="enforcing"' registries.conf
|
grep 'short-name-mode="enforcing"' registries.conf
|
||||||
if [[ $? == 1 ]]; then
|
if [[ $? == 1 ]]; then
|
||||||
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
|
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user