From c7b8d6123ae63a78540786eacfa882fd312c0d28 Mon Sep 17 00:00:00 2001 From: Lorenzo Fontana Date: Thu, 23 Jan 2020 12:11:28 +0100 Subject: [PATCH] chore(integration): add dkms to docker test deb runner Co-Authored-By: Leonardo Di Donato Signed-off-by: Lorenzo Fontana --- docker/tester/root/runners/deb.Dockerfile | 3 ++ docker/tester/root/usr/bin/entrypoint | 48 +++++++++++------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/docker/tester/root/runners/deb.Dockerfile b/docker/tester/root/runners/deb.Dockerfile index d6cec178..c21b1f2d 100644 --- a/docker/tester/root/runners/deb.Dockerfile +++ b/docker/tester/root/runners/deb.Dockerfile @@ -5,6 +5,9 @@ ARG FALCO_VERSION= RUN test -n FALCO_VERSION ENV FALCO_VERSION ${FALCO_VERSION} +RUN apt update -y +RUN apt install dkms -y + ADD falco-${FALCO_VERSION}-x86_64.deb / RUN dpkg -i /falco-${FALCO_VERSION}-x86_64.deb diff --git a/docker/tester/root/usr/bin/entrypoint b/docker/tester/root/usr/bin/entrypoint index 1e1bef6b..bf4ffc63 100755 --- a/docker/tester/root/usr/bin/entrypoint +++ b/docker/tester/root/usr/bin/entrypoint @@ -17,6 +17,30 @@ case "$BUILD_TYPE" in ;; esac +build_image() { + BUILD_DIR=$1 + BUILD_TYPE=$2 + FALCO_VERSION=$3 + PACKAGE_TYPE=$4 + PACKAGE="$BUILD_DIR/$BUILD_TYPE/falco-$FALCO_VERSION-x86_64.${PACKAGE_TYPE}" + if [ ! -f "$PACKAGE" ]; then + echo "Package not found: ${PACKAGE}." >&2 + exit 1 + fi + DOCKER_IMAGE_NAME="falcosecurity/falco:test-${PACKAGE_TYPE}" + echo "Building local docker image $DOCKER_IMAGE_NAME from latest ${PACKAGE_TYPE} package..." + + mkdir -p /packages + cp "$PACKAGE" /packages + docker build -f "/runners/$PACKAGE_TYPE.Dockerfile" --build-arg FALCO_VERSION="$FALCO_VERSION" -t "$DOCKER_IMAGE_NAME" /packages +} + +clean_image() { + PACKAGE_TYPE=$1 + DOCKER_IMAGE_NAME="falcosecurity/falco:test-${PACKAGE_TYPE}" + docker rmi -f "$DOCKER_IMAGE_NAME" +} + case "$CMD" in "test") if [ ! -d "$BUILD_DIR/$BUILD_TYPE/docker/local" ]; then @@ -58,27 +82,3 @@ case "$CMD" in exec "$CMD" "$@" ;; esac - -build_image() { - BUILD_DIR=$1 - BUILD_TYPE=$2 - FALCO_VERSION=$3 - PACKAGE_TYPE=$4 - PACKAGE="$BUILD_DIR/$BUILD_TYPE/falco-$FALCO_VERSION-x86_64.${PACKAGE_TYPE}" - if [ ! -f "$PACKAGE" ]; then - echo "Package not found: ${PACKAGE}." >&2 - exit 1 - fi - DOCKER_IMAGE_NAME="falcosecurity/falco:test-${PACKAGE_TYPE}" - echo "Building local docker image $DOCKER_IMAGE_NAME from latest ${PACKAGE_TYPE} package..." - - mkdir -p /packages - cp "$PACKAGE" /packages - docker build -f "/runners/$PACKAGE_TYPE.Dockerfile" --build-arg FALCO_VERSION="$FALCO_VERSION" -t "$DOCKER_IMAGE_NAME" /packages -} - -clean_image() { - PACKAGE_TYPE=$1 - DOCKER_IMAGE_NAME="falcosecurity/falco:test-${PACKAGE_TYPE}" - docker rmi -f "$DOCKER_IMAGE_NAME" -}