From e5e7a4761dc3170cbfb7c46051adc51cca510f0a Mon Sep 17 00:00:00 2001 From: Luca Guerra Date: Tue, 12 Sep 2023 15:32:45 +0000 Subject: [PATCH] fix(build): set the right bucket and version for driver legacy Signed-off-by: Luca Guerra --- .github/workflows/reusable_build_docker.yaml | 2 ++ .../driver-loader-legacy/docker-entrypoint.sh | 19 +++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/reusable_build_docker.yaml b/.github/workflows/reusable_build_docker.yaml index e1a4665b91c..5643f1ec2ce 100644 --- a/.github/workflows/reusable_build_docker.yaml +++ b/.github/workflows/reusable_build_docker.yaml @@ -80,6 +80,8 @@ jobs: run: | cd ${{ github.workspace }}/docker/driver-loader/ docker build -t docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.arch }}-${{ inputs.tag }} \ + --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} \ + --build-arg FALCO_VERSION=${{ inputs.version }} \ --build-arg TARGETARCH=${TARGETARCH} \ . docker save docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-driver-loader-legacy-${{ inputs.arch }}.tar diff --git a/docker/driver-loader-legacy/docker-entrypoint.sh b/docker/driver-loader-legacy/docker-entrypoint.sh index 9147fe10feb..86659bd3409 100755 --- a/docker/driver-loader-legacy/docker-entrypoint.sh +++ b/docker/driver-loader-legacy/docker-entrypoint.sh @@ -16,18 +16,13 @@ # limitations under the License. # -# Set the SKIP_DRIVER_LOADER variable to skip loading the driver -if [[ -z "${SKIP_DRIVER_LOADER}" ]]; then - echo "* Setting up /usr/src links from host" +echo "* Setting up /usr/src links from host" - for i in "$HOST_ROOT/usr/src"/* - do - base=$(basename "$i") - ln -s "$i" "/usr/src/$base" - done +for i in "$HOST_ROOT/usr/src"/* +do + base=$(basename "$i") + ln -s "$i" "/usr/src/$base" +done - /usr/bin/falco-driver-loader -fi - -exec "$@" \ No newline at end of file +/usr/bin/falco-driver-loader "$@"