From e7469b926d94525b993ff2092f2f723db76dae75 Mon Sep 17 00:00:00 2001 From: kongfei Date: Tue, 14 Jun 2022 21:22:03 +0800 Subject: [PATCH] new base image --- docker/Dockerfile | 6 +++--- docker/Dockerfile.goreleaser | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 75ba26b0..fb008850 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:22.10 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap wget tar libc6-compat file && \ - update-ca-certificates RUN set -ex && \ mkdir -p /usr/bin /etc/categraf -COPY conf /etc/categraf/conf COPY categraf /usr/bin/categraf +COPY conf /etc/categraf/conf + COPY entrypoint.sh /entrypoint.sh + CMD ["/entrypoint.sh"] diff --git a/docker/Dockerfile.goreleaser b/docker/Dockerfile.goreleaser index 40bafba8..d5e52ba2 100644 --- a/docker/Dockerfile.goreleaser +++ b/docker/Dockerfile.goreleaser @@ -1,8 +1,6 @@ FROM --platform=$BUILDPLATFORM ubuntu:22.10 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap wget tar libc6-compat file && \ - update-ca-certificates RUN set -ex && \ mkdir -p /usr/bin /etc/categraf