Skip to content

Commit

Permalink
Merge pull request #28 from flashcatcloud/new_dockerfile
Browse files Browse the repository at this point in the history
new base image
  • Loading branch information
kongfei605 authored Jun 14, 2022
2 parents f53ce58 + e7469b9 commit 8db5e6d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ dockers:
- conf/input.netstat/netstat.toml
- conf/input.net/net.toml
- conf/input.docker/docker.toml
- conf/input.kubernetes/kubernetes.toml
- conf/input.processes/processes.toml
use: buildx
build_flag_templates:
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM alpine:3.15
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"]
4 changes: 1 addition & 3 deletions docker/Dockerfile.goreleaser
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM --platform=$BUILDPLATFORM alpine:3.15
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
Expand Down

0 comments on commit 8db5e6d

Please sign in to comment.