From ad960a948555fc7f92b2f1e12c893b4298cb375e Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Thu, 2 Jul 2020 16:19:22 +0200 Subject: [PATCH] chore(docker): rename `SKIP_MODULE_LOAD` to `SKIP_DRIVER_LOADER` As per https://github.com/falcosecurity/falco/blob/master/proposals/20200506-artifacts-scope-part-2.md#action-items Signed-off-by: Leonardo Grasso --- docker/falco/docker-entrypoint.sh | 10 +++++++--- docker/local/docker-entrypoint.sh | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docker/falco/docker-entrypoint.sh b/docker/falco/docker-entrypoint.sh index 21fca6c6..3bf80b6b 100755 --- a/docker/falco/docker-entrypoint.sh +++ b/docker/falco/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (C) 2019 The Falco Authors. +# Copyright (C) 2020 The Falco Authors. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,10 +16,14 @@ # limitations under the License. # +# todo(leogr): remove deprecation notice within a couple of releases +if [[ ! -z "${SKIP_MODULE_LOAD}"]]; then + echo "* SKIP_MODULE_LOAD is deprecated and will be removed soon, use SKIP_DRIVER_LOADER instead" +fi -# Set the SKIP_MODULE_LOAD variable to skip loading the kernel module +# Set the SKIP_DRIVER_LOADER variable to skip loading the driver -if [[ -z "${SKIP_MODULE_LOAD}" ]]; then +if [[ -z "${SKIP_DRIVER_LOADER}" ]] && [[ -z "${SKIP_MODULE_LOAD}" ]]; then echo "* Setting up /usr/src links from host" for i in "$HOST_ROOT/usr/src"/* diff --git a/docker/local/docker-entrypoint.sh b/docker/local/docker-entrypoint.sh index f7f36937..9fc61927 100755 --- a/docker/local/docker-entrypoint.sh +++ b/docker/local/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (C) 2019 The Falco Authors. +# Copyright (C) 2020 The Falco Authors. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,9 +17,9 @@ # -# Set the SKIP_MODULE_LOAD variable to skip loading the kernel module +# Set the SKIP_DRIVER_LOADER variable to skip loading the driver -if [[ -z "${SKIP_MODULE_LOAD}" ]]; then +if [[ -z "${SKIP_DRIVER_LOADER}" ]]; then echo "* Setting up /usr/src links from host" for i in "$HOST_ROOT/usr/src"/*