Merge pull request #2757 from stmcginnis/sec-label

Update docker run `--security-opt` command format
bottlerocket-os · Aug 18, 2023 · 8c4df72 · 8c4df72
2 parents 947c178 + 7974715
commit 8c4df72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Makefile.toml b/Makefile.toml
@@ -506,7 +506,7 @@ rc=0
 if ! docker run --rm \
   --network=none \
   --user "$(id -u):$(id -g)" \
-  --security-opt label:disable \
+  --security-opt="label=disable" \
   -v "${BUILDSYS_TOOLS_DIR}":/tmp/tools \
   "${BUILDSYS_SDK_IMAGE}" \
   bash -c \
@@ -782,7 +782,7 @@ fi
 docker run --rm \
    --network=none \
    --user "$(id -u):$(id -g)" \
-   --security-opt label:disable \
+   --security-opt="label=disable" \
    -v "${BOOT_CONFIG_INPUT}":/tmp/bootconfig-input \
    -v "${boot_config}":/tmp/bootconfig.data \
    "${BUILDSYS_SDK_IMAGE}" \
@@ -803,7 +803,7 @@ script = [
 docker run --rm \
    --network=none \
    --user "$(id -u):$(id -g)" \
-   --security-opt label:disable \
+   --security-opt="label=disable" \
    -v "${BOOT_CONFIG}":/tmp/bootconfig.data \
    "${BUILDSYS_SDK_IMAGE}" \
    bootconfig -l /tmp/bootconfig.data
@@ -884,7 +884,7 @@ set +e
 docker run --rm \
   --network=none \
   --user "$(id -u):$(id -g)" \
-  --security-opt label:disable \
+  --security-opt="label=disable" \
   -e CARGO_HOME="/tmp/.cargo" \
   -v "${CARGO_HOME}":/tmp/.cargo \
   -v "${BUILDSYS_ROOT_DIR}/sources":/tmp/sources \
@@ -922,7 +922,7 @@ set +e
 
 docker run --rm \
   --user "$(id -u):$(id -g)" \
-  --security-opt label:disable \
+  --security-opt="label=disable" \
   -e CARGO_HOME="/tmp/.cargo" \
   -v "${CARGO_HOME}":/tmp/.cargo \
   -v "${BUILDSYS_ROOT_DIR}/licenses:/tmp/licenses" \

diff --git a/PROVISIONING-METAL.md b/PROVISIONING-METAL.md
@@ -308,7 +308,7 @@ touch $(pwd)/bootconfig.data
 docker run --rm \
    --network=none \
    --user "$(id -u):$(id -g)" \
-   --security-opt label:disable \
+   --security-opt label=disable \
    -v $(pwd)/bootconfig-input:/tmp/bootconfig-input \
    -v $(pwd)/bootconfig.data:/tmp/bootconfig.data \
    "${SDK_IMAGE}" \
@@ -328,7 +328,7 @@ SDK_IMAGE="public.ecr.aws/bottlerocket/bottlerocket-sdk-${ARCH}:${SDK_VERSION}"
 docker run --rm \
    --network=none \
    --user "$(id -u):$(id -g)" \
-   --security-opt label:disable \
+   --security-opt label=disable \
    -v $(pwd)/bootconfig.data:/tmp/bootconfig.data \
    "${SDK_IMAGE}" \
    bootconfig -l /tmp/bootconfig.data

diff --git a/tools/docker-go b/tools/docker-go
@@ -85,7 +85,7 @@ docker run --rm \
   "${go_env[@]}" \
   "${proxy_env[@]}" \
   --user "$(id -u):$(id -g)" \
-  --security-opt label:disable \
+  --security-opt="label=disable" \
   ${DOCKER_RUN_ARGS} \
   -v "${GOPATH}":"${GOPATH}" \
   -v "${GO_MODULE_PATH}":"${GO_MODULE_PATH}" \