Do not create .dockerenv.privileged / .podmanenv files

mlschroe · mlschroe · commit bfebf93a8770 · 2023-06-28T13:12:09.000+02:00
diff --git a/build-vm-docker b/build-vm-docker
@@ -51,7 +51,6 @@ vm_kill_docker() {
 vm_fixup_docker() {
     # we need this as marker for handling container specific code. Docker is setting it as well
     touch $BUILD_ROOT/.dockerenv
-    test -n "$VM_TYPE_PRIVILEGED" && touch $BUILD_ROOT/.dockerenv.privileged
 }
 
 vm_attach_root_docker() {
diff --git a/build-vm-podman b/build-vm-podman
@@ -47,15 +47,10 @@ vm_kill_podman() {
 }
 
 vm_fixup_podman() {
-
     # create a scratch image for our build environment
     if ! podman image exists build-scratch:latest ; then
         echo "FROM scratch"  | podman build -t build-scratch:latest  -
     fi
-
-    # we need this as marker for handling container specific code. Docker is setting it as well
-    touch $BUILD_ROOT/.podmanenv
-    test -n "$VM_TYPE_PRIVILEGED" && touch $BUILD_ROOT/.podmanenv.privileged
 }
 
 vm_attach_root_podman() {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ vm_kill_docker() {`
`51`	`51`	`vm_fixup_docker() {`
`52`	`52`	`# we need this as marker for handling container specific code. Docker is setting it as well`
`53`	`53`	`touch $BUILD_ROOT/.dockerenv`
`54`		`- test -n "$VM_TYPE_PRIVILEGED" && touch $BUILD_ROOT/.dockerenv.privileged`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`vm_attach_root_docker() {`
Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,10 @@ vm_kill_podman() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`vm_fixup_podman() {`
`50`		`-`
`51`	`50`	`# create a scratch image for our build environment`
`52`	`51`	`if ! podman image exists build-scratch:latest ; then`
`53`	`52`	`echo "FROM scratch" \| podman build -t build-scratch:latest -`
`54`	`53`	`fi`
`55`		`-`
`56`		`- # we need this as marker for handling container specific code. Docker is setting it as well`
`57`		`- touch $BUILD_ROOT/.podmanenv`
`58`		`- test -n "$VM_TYPE_PRIVILEGED" && touch $BUILD_ROOT/.podmanenv.privileged`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`vm_attach_root_podman() {`