diff --git a/containers.conf b/containers.conf index 8c532f0..a9b4ca3 100644 --- a/containers.conf +++ b/containers.conf @@ -183,7 +183,7 @@ default_sysctls = [ # Logging driver for the container. Available options: k8s-file and journald. # -#log_driver = "k8s-file" +log_driver = "journald" # 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 diff --git a/storage.conf b/storage.conf index 4296d34..f15e18b 100644 --- a/storage.conf +++ b/storage.conf @@ -48,7 +48,6 @@ graphroot = "/var/lib/containers/storage" # AdditionalImageStores is used to pass paths to additional Read/Only image stores # Must be comma separated list. additionalimagestores = [ -"/usr/lib/containers/storage", ] # Allows specification of how storage is populated when pulling images. This @@ -71,7 +70,7 @@ additionalimagestores = [ # Tells containers/storage where an ostree repository exists that might have # previously pulled content which can be used when attempting to avoid # pulling content from the container registry -pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""} +pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""} # 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, diff --git a/update.sh b/update.sh index 7066c20..ba6c078 100755 --- a/update.sh +++ b/update.sh @@ -4,7 +4,7 @@ set -eox pipefail spectool -fg containers-common.spec -if [[ $(git reg-parse --abbrev-ref HEAD) == "rawhide" ]]; then +if [[ $(git rev-parse --abbrev-ref HEAD) == "rawhide" ]]; then 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=""}/' \ storage.conf