29 lines
1023 B
Diff
29 lines
1023 B
Diff
|
From 10af937fc2e095bce2da902c20e1f6b5e6178387 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongtao <zhongtao17@huawei.com>
|
||
|
|
Date: Mon, 9 Sep 2024 17:18:52 +0800
|
||
|
|
Subject: [PATCH 136/149] do not use 1000 as the test gid to prevent conflicts
|
||
|
|
with existing gids in the image
|
||
|
|
|
||
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
||
|
|
---
|
||
|
|
CI/test_cases/container_cases/exec_additional_gids.sh | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/CI/test_cases/container_cases/exec_additional_gids.sh b/CI/test_cases/container_cases/exec_additional_gids.sh
|
||
|
|
index 2edfd750..a62ab78c 100755
|
||
|
|
--- a/CI/test_cases/container_cases/exec_additional_gids.sh
|
||
|
|
+++ b/CI/test_cases/container_cases/exec_additional_gids.sh
|
||
|
|
@@ -25,7 +25,8 @@ source ../helpers.sh
|
||
|
|
test_log=$(mktemp /tmp/additional_gids_test_XXX)
|
||
|
|
|
||
|
|
USERNAME="user"
|
||
|
|
-USER_UID="1000"
|
||
|
|
+# Do not use 1000 as the test gid because "ubuntu:x:1000:" already exists in the ubuntu image
|
||
|
|
+USER_UID="1002"
|
||
|
|
USER_GID="$USER_UID"
|
||
|
|
ADDITIONAL_GID="1001"
|
||
|
|
ADDITIONAL_GROUP="additional"
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|