From cee729a0cd23c49f894217de2d6a2f94913b0da5 Mon Sep 17 00:00:00 2001 From: Pavlos Tzianos Date: Thu, 12 Sep 2024 17:30:50 +0100 Subject: [PATCH] fix nit to prevent warnings from docker build daemon --- containers/Dockerfile.draconctl | 4 ++-- scripts/build_component_container.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/containers/Dockerfile.draconctl b/containers/Dockerfile.draconctl index 01b66bdfe..9d550ea61 100644 --- a/containers/Dockerfile.draconctl +++ b/containers/Dockerfile.draconctl @@ -1,9 +1,9 @@ ARG BASE_MIGRATION_IMAGE FROM ${BASE_MIGRATION_IMAGE:-scratch} -LABEL org.opencontainers.image.description "Draconctl is a command line tool for interacting with Dracon, you can find documentation for it at github.com/ocurity/dracon" +LABEL org.opencontainers.image.description="Draconctl is a command line tool for interacting with Dracon, you can find documentation for it at github.com/ocurity/dracon" COPY ./bin/cmd/draconctl /bin/draconctl COPY ./pkg/enrichment/migrations /etc/dracon/migrations/enrichment -ENTRYPOINT [ "/bin/draconctl" ] +ENTRYPOINT ["/bin/draconctl"] diff --git a/scripts/build_component_container.sh b/scripts/build_component_container.sh index 2ad5e8d9e..c2cee60f6 100755 --- a/scripts/build_component_container.sh +++ b/scripts/build_component_container.sh @@ -24,13 +24,13 @@ then make -C "${executable_src_path}" --no-print-directory --quiet container CONTAINER_REPO="${CONTAINER_REPO}" DRACON_VERSION="${DRACON_VERSION}" else dockerfile_template=" - FROM ${BASE_IMAGE:-scratch} \n - COPY ${executable_path} /app/${executable_path} \n - ENTRYPOINT ["/app/${executable_path}"] \n + FROM ${BASE_IMAGE:-scratch} \n + COPY ${executable_path} /app/${executable} \n + ENTRYPOINT [\"/app/${executable}\"] \n " dockerfile_path=$(mktemp) printf "${dockerfile_template}" > "${dockerfile_path}" - docker build -t "${CONTAINER_REPO}/${executable_src_path}:${DRACON_VERSION}" \ + docker --debug build -t "${CONTAINER_REPO}/${executable_src_path}:${DRACON_VERSION}" \ $([ "${SOURCE_CODE_REPO}" != "" ] && echo "--label=org.opencontainers.image.source=${SOURCE_CODE_REPO}" ) \ -f "${dockerfile_path}" ./bin fi