remove CAP_ from docker capabilities in Makefile

monasticacademy · Nov 18, 2024 · 45ecaa9 · 45ecaa9
1 parent 958c918
commit 45ecaa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -98,7 +98,7 @@ test-with-docker: clean
 		--rm \
 		--volume .:/src \
 		--workdir /src \
-		--cap-add CAP_SYS_ADMIN \
+		--cap-add SYS_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
 		ubuntu \
 		.build/httptap --no-overlay -- curl -so out https://www.example.com
@@ -112,7 +112,7 @@ test-with-docker-alpine: clean
 		--rm \
 		--volume .:/src \
 		--workdir /src \
-		--cap-add CAP_SYS_ADMIN \
+		--cap-add SYS_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
 		alpine/curl \
 		.build/httptap --no-overlay -- curl -so out https://www.example.com
@@ -127,7 +127,7 @@ test-with-docker-distroless: clean
 		--rm \
 		--volume .:/src \
 		--workdir /src \
-		--cap-add CAP_SYS_ADMIN \
+		--cap-add SYS_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
 		gcr.io/distroless/static-debian12 \
 		.build/httptap --no-overlay -- .build/hi

diff --git a/httptap.go b/httptap.go
@@ -222,7 +222,7 @@ func Main() error {
 			os.Exit(exiterr.ExitCode())
 		}
 		if err != nil {
-			return fmt.Errorf("error re-exec'ing ourselves in a new user namespace: %w", err)
+			return fmt.Errorf("error re-executing ourselves in a new user namespace: %w", err)
 		}
 		return nil
 	}