Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

docker/torcx: disable SELinux by default on dockerd wrapper script #1149

Merged
merged 2 commits into from Jul 30, 2021

Conversation

tormath1
Copy link
Contributor

In #1055 we disabled SELinux for Docker but we did not port this change to the deprecated scripts which enable by default SELinux.

Testing done

We have a test for this docker.lib-coreos-dockerd-compat but we did not catch the failure because we explicitely set the --selinux-enabled to false - which overrides the default behavior of dockerd script. (see: flatcar/mantle@9101e70#diff-52b597358285b8b043950f2001c39f118a56284357fb13493292ad11d9aa224cR183)

Closes: flatcar/Flatcar#457

Mathieu Tortuyaux added 2 commits July 30, 2021 10:33
it's the default behavior now. Since this script is deprecated, we
do a minimum change on it.

Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
this is now the default behavior - since this script is deprecated
we do a minimum update on it

Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
@tormath1 tormath1 requested a review from a team July 30, 2021 08:41
@tormath1 tormath1 self-assigned this Jul 30, 2021
@tormath1 tormath1 merged commit 7122b6c into main Jul 30, 2021
@tormath1 tormath1 deleted the tormath1/fix-457 branch July 30, 2021 13:00
@tormath1
Copy link
Contributor Author

cherry-picked to:

  • flatcar-2905
  • flatcar-2920
  • flatcar-2942

@tormath1 tormath1 added this to Ready to Release 2021-08-02 in Flatcar Container Linux Releases Planning Jul 30, 2021
@vbatts vbatts removed this from Released 2021-08-02 in Flatcar Container Linux Releases Planning Sep 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants