Bugfix/344 add certificates to consumers

Makefile

@@ -34,7 +34,6 @@ PG_VERSION=11.9.8
 DRACON_NS=dracon
 TEKTON_NS=tekton-pipelines
 ARANGODB_NS=arangodb
-BASE_IMAGE=scratch
 
 DOCKER=docker
 PROTOC=protoc

components/producers/aggregator/Makefile

@@ -3,15 +3,15 @@
 CONTAINER_REPO=
 DRACON_VERSION=
 SOURCE_CODE_REPO=
-PRODUCER_AGGREGATOR_BASE_IMAGE=$(shell test -e .custom_image && cat .custom_image || echo "scratch")
 
 DOCKER=docker
 
 container:
-	$(DOCKER) build --tag $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) \
-					--file Dockerfile \
+	$(DOCKER) --debug build --tag $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) \
+					--build-arg EXECUTABLE_SRC_PATH=components/producers/aggregator/aggregator-parser \
+        			--build-arg EXECUTABLE_TARGET_PATH=components/producers/aggregator/tagger \
 					$$([ "${SOURCE_CODE_REPO}" != "" ] && echo "--label=org.opencontainers.image.source=${SOURCE_CODE_REPO}" ) \
-					--build-arg PRODUCER_AGGREGATOR_BASE_IMAGE=$(PRODUCER_AGGREGATOR_BASE_IMAGE) ../../../bin 1>&2
+					--file ${BASE_IMAGE_PATH} ../../../bin 1>&2
 
 publish:
 	$(DOCKER) push $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) 1>&2

components/producers/typescript-eslint/eslint-wrapper/Dockerfile

@@ -1,5 +1,5 @@
 ARG ESLINT_WRAPPER_BASE_IMAGE
-FROM ${ESLINT_WRAPPER_BASE_IMAGE}
+FROM ${ESLINT_WRAPPER_BASE_IMAGE:-node:lts}
 
 WORKDIR /home/node/workspace
 COPY components/producers/typescript-eslint/eslint-wrapper/eslintrc.js /home/node/workspace

components/producers/typescript-eslint/eslint-wrapper/Makefile

@@ -2,7 +2,6 @@
 
 CONTAINER_REPO=
 DRACON_VERSION=
-ESLINT_WRAPPER_BASE_IMAGE=$(shell test -e .custom_image && cat .custom_image || echo "node:lts")
 
 DOCKER=docker
 

containers/Dockerfile.base

@@ -0,0 +1,21 @@
+FROM golang:alpine AS builder
+
+ARG EXECUTABLE_SRC_PATH
+ARG EXECUTABLE_TARGET_PATH
+ENV EXECUTABLE_TARGET_PATH=${EXECUTABLE_TARGET_PATH}
+COPY ${EXECUTABLE_SRC_PATH} /app/${EXECUTABLE_TARGET_PATH}
+
+RUN apk update && \
+    apk upgrade && \
+    apk add --no-cache ca-certificates && \
+    update-ca-certificates && \
+    ln -s /app/${EXECUTABLE_TARGET_PATH} /bin/component
+
+FROM scratch
+
+ARG EXECUTABLE_TARGET_PATH
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /app/${EXECUTABLE_TARGET_PATH} /app/${EXECUTABLE_TARGET_PATH}
+COPY --from=builder /bin/component /bin/component
+
+ENTRYPOINT ["/bin/component"]

scripts/build_component_container.sh

@@ -19,20 +19,18 @@ echo "${1}" | grep -Eq ^components/consumers/.*$ && executable="${executable}" |
 executable_src_path=$(dirname "${1}")
 executable_path=$(dirname "${1}")/"${executable}"
 
+BASE_IMAGE_PATH=$(realpath ${BASE_IMAGE_PATH:-./containers/Dockerfile.base})
+
 if make -C "${executable_src_path}" --no-print-directory --dry-run container >/dev/null 2>&1
 then
-    make -C "${executable_src_path}" --no-print-directory --quiet container CONTAINER_REPO="${CONTAINER_REPO}" DRACON_VERSION="${DRACON_VERSION}"
+    make -C "${executable_src_path}" --no-print-directory --quiet container BASE_IMAGE_PATH="${BASE_IMAGE_PATH}" 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
-    "
-    dockerfile_path=$(mktemp)
-    printf "${dockerfile_template}" > "${dockerfile_path}"
-    docker --debug build -t "${CONTAINER_REPO}/${executable_src_path}:${DRACON_VERSION}" \
+    docker build \
+        --build-arg EXECUTABLE_SRC_PATH=${executable_path} \
+        --build-arg EXECUTABLE_TARGET_PATH=${executable_path} \
+        -t "${CONTAINER_REPO}/${executable_src_path}:${DRACON_VERSION}" \
         $([ "${SOURCE_CODE_REPO}" != "" ] && echo "--label=org.opencontainers.image.source=${SOURCE_CODE_REPO}" ) \
-        -f "${dockerfile_path}" ./bin
+        -f "${BASE_IMAGE_PATH}" ./bin
 fi
 
 if make -C "${executable_src_path}" --no-print-directory --dry-run extras >/dev/null 2>&1