test/docker: Fix relying on .dockerenv file

Newer versions of Docker don't seem to have it, nor do we want to rely on the implementation details of a specific container runtime anyway.
CyberShadow · Oct 28, 2023 · 5949071 · 5949071
1 parent 66c8c15
commit 5949071
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
@@ -23,6 +23,7 @@ RUN pacman -Sy
 RUN pacman --noconfirm -S rubygems ruby-rdoc pacutils expect aur
 RUN sudo -u aconfmgr gem install bashcov
 
+ENV ACONFMGR_IN_CONTAINER=1
 RUN /opt/aur/setup.sh
 
 RUN useradd billy
diff --git a/test/docker/aur/setup.sh b/test/docker/aur/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eEuo pipefail
 
-if [[ ! -f /.dockerenv ]]
+if [[ ! -v ACONFMGR_IN_CONTAINER ]]
 then
 	echo 'Refusing to run setup outside Docker.'
 	exit 1

diff --git a/test/docker/aur/start.sh b/test/docker/aur/start.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eEuo pipefail
 
-if [[ ! -f /.dockerenv ]]
+if [[ ! -v ACONFMGR_IN_CONTAINER ]]
 then
 	echo 'Refusing to start outside Docker.'
 	exit 1

diff --git a/test/t/lib-funcs-integ.bash b/test/t/lib-funcs-integ.bash
@@ -374,8 +374,13 @@ function TestInitAUR() {
 
 	LogEnter 'Initializing AUR support...\n'
 
+	if [[ ! -v ACONFMGR_IN_CONTAINER ]]
+	then
+		FatalError 'Refusing to start outside Docker.\n'
+	fi
+
 	LogEnter 'Starting AUR...\n'
-	command sudo /opt/aur/start.sh
+	command sudo env ACONFMGR_IN_CONTAINER=1 /opt/aur/start.sh
 	LogLeave
 
 	LogEnter 'Generating a SSH key...\n'