fix: latest Pulumi, make rootless containers work again using podman 4.X
This commit is contained in:
parent
8eefe1b3d8
commit
fb7258dc0e
@ -1,6 +1,6 @@
|
|||||||
ARG RUNTIME_VERSION="3.10"
|
ARG RUNTIME_VERSION="3.10"
|
||||||
ARG DISTRO_VERSION="3.16"
|
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
|
FROM python:${RUNTIME_VERSION}-alpine${DISTRO_VERSION} AS builder
|
||||||
ARG PULUMI_VERSION
|
ARG PULUMI_VERSION
|
||||||
@ -79,7 +79,6 @@ RUN echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subuid && \
|
|||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
ENV XDG_RUNTIME_DIR=/tmp/podman-run-1000
|
|
||||||
ENV _CONTAINERS_USERNS_CONFIGURED=""
|
ENV _CONTAINERS_USERNS_CONFIGURED=""
|
||||||
ENV BUILDAH_ISOLATION=chroot
|
ENV BUILDAH_ISOLATION=chroot
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
[containers]
|
[containers]
|
||||||
|
volumes = [ "/proc:/proc" ]
|
||||||
netns="host"
|
netns="host"
|
||||||
userns="host"
|
userns="host"
|
||||||
ipcns="host"
|
ipcns="host"
|
||||||
@ -6,6 +7,7 @@ utsns="host"
|
|||||||
cgroupns="host"
|
cgroupns="host"
|
||||||
cgroups="disabled"
|
cgroups="disabled"
|
||||||
log_driver = "k8s-file"
|
log_driver = "k8s-file"
|
||||||
|
|
||||||
[engine]
|
[engine]
|
||||||
cgroup_manager = "cgroupfs"
|
cgroup_manager = "cgroupfs"
|
||||||
events_logger="file"
|
events_logger="file"
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
[containers]
|
|
||||||
volumes = [
|
|
||||||
"/proc:/proc",
|
|
||||||
]
|
|
@ -1,14 +1,2 @@
|
|||||||
[storage]
|
[storage]
|
||||||
driver = "overlay"
|
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]
|
|
||||||
|
@ -5,7 +5,7 @@ click
|
|||||||
pexpect
|
pexpect
|
||||||
python-minifier
|
python-minifier
|
||||||
cfn-lint>=0.34
|
cfn-lint>=0.34
|
||||||
pulumi>=3.40.1
|
pulumi>=3.45.0
|
||||||
pulumi-aws>5.0.0
|
pulumi-aws>5.0.0
|
||||||
pulumi-aws-native
|
pulumi-aws-native
|
||||||
pulumi-policy
|
pulumi-policy
|
||||||
|
Loading…
Reference in New Issue
Block a user