From bcf0dc6e6edb603b84cd0329f41992c430cbdece Mon Sep 17 00:00:00 2001 From: Favour Daniel Date: Wed, 25 Sep 2024 14:10:07 +0100 Subject: [PATCH] modified Dockerfiles --- cmd/signozcollector/Dockerfile | 10 +++++++--- cmd/signozschemamigrator/Dockerfile | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/signozcollector/Dockerfile b/cmd/signozcollector/Dockerfile index dbef024f..a3989e21 100644 --- a/cmd/signozcollector/Dockerfile +++ b/cmd/signozcollector/Dockerfile @@ -1,18 +1,22 @@ # use a minimal alpine image -FROM alpine:3 + +ARG ALPINE_SHA="pass-a-valid-docker-sha-otherwise-this-will-fail" + +FROM alpine:3@sha256:${ALPINE_SHA} # add ca-certificates in case you need them RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/* # define arguments and default values -ARG TARGETOS TARGETARCH ARG USER_UID=10001 +ARG OS="linux" +ARG ARCH # create a non-root user for running the collector USER ${USER_UID} # copy the binaries from the multi-stage build -COPY .build/${TARGETOS}-${TARGETARCH}/signoz-collector /signoz-collector +COPY ./target/${OS}-${ARCH}/signoz-collector /signoz-collector # copy the config file COPY config/default-config.yaml /etc/otel/config.yaml diff --git a/cmd/signozschemamigrator/Dockerfile b/cmd/signozschemamigrator/Dockerfile index d9e69be3..94c07164 100644 --- a/cmd/signozschemamigrator/Dockerfile +++ b/cmd/signozschemamigrator/Dockerfile @@ -1,15 +1,19 @@ # use a minimal alpine image -FROM alpine:3.17 + +ARG ALPINE_SHA="pass-a-valid-docker-sha-otherwise-this-will-fail" + +FROM alpine:3.17@sha256:${ALPINE_SHA} # define arguments and default values -ARG TARGETOS TARGETARCH ARG USER_UID=10001 +ARG OS="linux" +ARG ARCH # create a non-root user for running the migrator USER ${USER_UID} # copy the binaries from the multi-stage build -COPY .build/${TARGETOS}-${TARGETARCH}/signoz-schema-migrator /signoz-schema-migrator +COPY ./target/${OS}-${ARCH}/signoz-schema-migrator /signoz-schema-migrator COPY migrationmanager ./migrationmanager # run the binary as the entrypoint and pass the default dsn as a flag