opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14281 from vrothberg/fix-14251

Browse Source 
fix --init with /dev bind mount
This commit is contained in:
OpenShift Merge Robot
2022-05-23 10:17:59 -04:00
committed by GitHub
parent be255287c9 633d5f1f8b
commit 7d00b0ea0d
7 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/define/container.go
View File

@ -35,4 +35,6 @@ const (
// OneShotInitContainer is a container that only runs as init once
// and is then deleted.
OneShotInitContainer = "once"
// ContainerInitPath is the default path of the mounted container init.
ContainerInitPath = "/run/podman-init"
)

23
libpod/diff.go
View File

@ -8,17 +8,18 @@ import (
)
var initInodes = map[string]bool{
"/dev": true,
"/etc/hostname": true,
"/etc/hosts": true,
"/etc/resolv.conf": true,
"/proc": true,
"/run": true,
"/run/notify": true,
"/run/.containerenv": true,
"/run/secrets": true,
"/sys": true,
"/etc/mtab": true,
"/dev": true,
"/etc/hostname": true,
"/etc/hosts": true,
"/etc/resolv.conf": true,
"/proc": true,
"/run": true,
"/run/notify": true,
"/run/.containerenv": true,
"/run/secrets": true,
define.ContainerInitPath: true,
"/sys": true,
"/etc/mtab": true,
}
// GetDiff returns the differences between the two images, layers, or containers