diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-06-06 13:00:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 13:00:02 -0400 |
| commit | 521aebf6bedc4c2ce204ec99b5e6383b273c2354 (patch) | |
| tree | 0202861ab43ec042e44a60c4736c6bc25f6d23d9 /contrib | |
| parent | b2ebb91656b4c735a2e392274632f2e097423cad (diff) | |
| parent | 335925f47f76a6ba6c066434bdb564810aca99cb (diff) | |
| download | podman-521aebf6bedc4c2ce204ec99b5e6383b273c2354.tar.gz podman-521aebf6bedc4c2ce204ec99b5e6383b273c2354.tar.bz2 podman-521aebf6bedc4c2ce204ec99b5e6383b273c2354.zip | |
Merge pull request #14500 from cevich/tickle_podmanimage
[CI:BUILD] Minor: Remove useless addition of storage.conf
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/podmanimage/stable/Containerfile | 1 | ||||
| -rw-r--r-- | contrib/podmanimage/stable/storage.conf | 6 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Containerfile | 1 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Containerfile | 1 |
4 files changed, 0 insertions, 9 deletions
diff --git a/contrib/podmanimage/stable/Containerfile b/contrib/podmanimage/stable/Containerfile index 40a2cb5f3..f4ab0cc79 100644 --- a/contrib/podmanimage/stable/Containerfile +++ b/contrib/podmanimage/stable/Containerfile @@ -23,7 +23,6 @@ echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ARG _REPO_URL="https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable" -ADD $_REPO_URL/storage.conf /etc/containers/storage.conf ADD $_REPO_URL/containers.conf /etc/containers/containers.conf ADD $_REPO_URL/podman-containers.conf /home/podman/.config/containers/containers.conf diff --git a/contrib/podmanimage/stable/storage.conf b/contrib/podmanimage/stable/storage.conf deleted file mode 100644 index bc8d8c111..000000000 --- a/contrib/podmanimage/stable/storage.conf +++ /dev/null @@ -1,6 +0,0 @@ -[storage.options] -additionalimagestores = ["/var/lib/shared"] - -[storage.options.overlay] -mountopt = "nodev,fsync=0" -mount_program = "/usr/bin/fuse-overlayfs" diff --git a/contrib/podmanimage/testing/Containerfile b/contrib/podmanimage/testing/Containerfile index 5fa794baf..0f2dd891f 100644 --- a/contrib/podmanimage/testing/Containerfile +++ b/contrib/podmanimage/testing/Containerfile @@ -23,7 +23,6 @@ echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ARG _REPO_URL="https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable" -ADD $_REPO_URL/storage.conf /etc/containers/storage.conf ADD $_REPO_URL/containers.conf /etc/containers/containers.conf ADD $_REPO_URL/podman-containers.conf /home/podman/.config/containers/containers.conf diff --git a/contrib/podmanimage/upstream/Containerfile b/contrib/podmanimage/upstream/Containerfile index b338a33ae..256c31232 100644 --- a/contrib/podmanimage/upstream/Containerfile +++ b/contrib/podmanimage/upstream/Containerfile @@ -29,7 +29,6 @@ echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ARG _REPO_URL="https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable" -ADD $_REPO_URL/storage.conf /etc/containers/storage.conf ADD $_REPO_URL/containers.conf /etc/containers/containers.conf ADD $_REPO_URL/podman-containers.conf /home/podman/.config/containers/containers.conf |