Skip to content

Commit 6b62ba1

Browse files
committed
install: Drop code/test uses of --security-opt
We think this is unnecessary now; part of improving the ergonomics of `bootc install` in general, but especially with the `to-existing-root` path. Once this lands, at some point later then we can also remove it from all of the documentation. But the most safe thing is to leave it in the docs for a bit longer. Closes: #928 Signed-off-by: Colin Walters <[email protected]>
1 parent 5ad7494 commit 6b62ba1

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

ostree-ext/.github/workflows/bootc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Integration tests
6060
run: |
6161
set -xeuo pipefail
62-
sudo podman run --rm -ti --privileged -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
62+
sudo podman run --rm -ti --privileged -v ./usr/bin/bootc:/usr/bin/bootc --pid=host \
6363
quay.io/centos-bootc/centos-bootc-dev:stream9 bootc install to-filesystem \
6464
--karg=foo=bar --disable-selinux --replace=alongside /target
6565

tests-integration/src/install.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,7 @@ use fn_error_context::context;
1111
use libtest_mimic::Trial;
1212
use xshell::{cmd, Shell};
1313

14-
pub(crate) const BASE_ARGS: &[&str] = &[
15-
"podman",
16-
"run",
17-
"--rm",
18-
"--privileged",
19-
"--pid=host",
20-
"--security-opt",
21-
"label=disable",
22-
];
14+
pub(crate) const BASE_ARGS: &[&str] = &["podman", "run", "--rm", "--privileged", "--pid=host"];
2315

2416
// Arbitrary
2517
const NON_DEFAULT_STATEROOT: &str = "foo";

tests/e2e/bootc-install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ case "$TEST_CASE" in
233233
--rm \
234234
--privileged \
235235
--pid=host \
236-
--security-opt label=type:unconfined_t \
237236
-v .:/output \
238237
"$TEST_IMAGE_URL" \
239238
bootc install to-disk --filesystem "$ROOTFS" --generic-image --via-loopback /output/disk.raw

tests/e2e/playbooks/install.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
--privileged \
5555
--tls-verify=false \
5656
--pid=host \
57-
--security-opt label=type:unconfined_t \
5857
{{ test_image_url }} \
5958
bootc install to-existing-root"
6059
become: true

tests/plugins/bootc-install.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ def _build_bootc_disk(self, containerimage: str, image_builder: str) -> None:
234234
tmt.utils.Command(
235235
"podman", "run", "--rm", "--privileged",
236236
"-v", f'{CONTAINER_STORAGE_DIR}:{CONTAINER_STORAGE_DIR}',
237-
"--security-opt", "label=type:unconfined_t",
238237
"-v", f"{self.workdir}:/output",
239238
image_builder, "build",
240239
"--type", "qcow2",

0 commit comments

Comments
 (0)