diff --git a/Dockerfile b/Dockerfile index 2268b8a..f3a1f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG RUNTIME_VERSION="3.10" ARG DISTRO_VERSION="3.16" -ARG PULUMI_VERSION="3.40.1" +ARG PULUMI_VERSION="3.45.0" FROM python:${RUNTIME_VERSION}-alpine${DISTRO_VERSION} AS builder ARG PULUMI_VERSION @@ -79,7 +79,6 @@ RUN echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subuid && \ WORKDIR /workspace -ENV XDG_RUNTIME_DIR=/tmp/podman-run-1000 ENV _CONTAINERS_USERNS_CONFIGURED="" ENV BUILDAH_ISOLATION=chroot diff --git a/conf/containers.conf b/conf/containers.conf index 220c1f8..59b7fba 100644 --- a/conf/containers.conf +++ b/conf/containers.conf @@ -1,4 +1,5 @@ [containers] +volumes = [ "/proc:/proc" ] netns="host" userns="host" ipcns="host" @@ -6,6 +7,7 @@ utsns="host" cgroupns="host" cgroups="disabled" log_driver = "k8s-file" + [engine] cgroup_manager = "cgroupfs" events_logger="file" diff --git a/conf/podman-containers.conf b/conf/podman-containers.conf deleted file mode 100644 index 503cca3..0000000 --- a/conf/podman-containers.conf +++ /dev/null @@ -1,4 +0,0 @@ -[containers] -volumes = [ - "/proc:/proc", -] diff --git a/conf/storage.conf b/conf/storage.conf index 633dfc4..2f4bc14 100644 --- a/conf/storage.conf +++ b/conf/storage.conf @@ -1,14 +1,2 @@ [storage] driver = "overlay" -runroot = "/run/containers/storage" -graphroot = "/var/lib/containers/storage" - -[storage.options] -additionalimagestores = [ -"/var/lib/shared", -] - -[storage.options.overlay] -mount_program = "/usr/bin/fuse-overlayfs" -mountopt = "nodev,fsync=0" -[storage.options.thinpool] diff --git a/requirements.txt b/requirements.txt index 7be7bca..4772dbf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ click pexpect python-minifier cfn-lint>=0.34 -pulumi>=3.40.1 +pulumi>=3.45.0 pulumi-aws>5.0.0 pulumi-aws-native pulumi-policy