diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-09-05 06:24:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 13:24:18 +0300 |
commit | 6efd6b7fe1737eaead41b5659c003bfe6f248774 (patch) | |
tree | 9ac2f5f5e62d93f9240c1713303dc7ea260c8c01 | |
parent | ca232e3548bd2de14169ea332c733a97998d0b04 (diff) |
Assorted Dockerfile cleanup. (#15902)
- Drop old, pointless comments.
- Reorganize so that invariant layers are first, making build caching
more efficient.
-rw-r--r-- | packaging/docker/Dockerfile | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index cf63703624..8aba64d6ee 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -61,31 +61,39 @@ RUN mkdir -p /app/usr/sbin/ \ # hadolint ignore=DL3007 FROM netdata/base:latest as base +LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>" +LABEL org.opencontainers.image.url="https://netdata.cloud" +LABEL org.opencontainers.image.documentation="https://learn.netdata.cloud" +LABEL org.opencontainers.image.source="https://github.com/netdata/netdata" +LABEL org.opencontainers.image.title="Netdata Agent" +LABEL org.opencontainers.image.description="Official Netdata Agent Docker Image" +LABEL org.opencontainers.image.vendor="Netdata Inc." + ARG OFFICIAL_IMAGE=false ENV NETDATA_OFFICIAL_IMAGE=$OFFICIAL_IMAGE -# Configure system +ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false + ARG NETDATA_UID=201 ARG NETDATA_GID=201 ENV DOCKER_GRP netdata ENV DOCKER_USR netdata # If DISABLE_TELEMETRY is set, it will disable anonymous stats collection and reporting #ENV DISABLE_TELEMETRY=1 +ENV NETDATA_LISTENER_PORT 19999 +EXPOSE $NETDATA_LISTENER_PORT + +ENV NETDATA_EXTRA_APK_PACKAGES="" -# Copy files over RUN mkdir -p /opt/src /var/log/netdata && \ - # Link log files to stdout ln -sf /dev/stdout /var/log/netdata/access.log && \ ln -sf /dev/stdout /var/log/netdata/debug.log && \ ln -sf /dev/stderr /var/log/netdata/error.log && \ ln -sf /dev/stdout /var/log/netdata/collector.log && \ ln -sf /dev/stdout /var/log/netdata/health.log && \ - # Add netdata user addgroup -g ${NETDATA_GID} -S "${DOCKER_GRP}" && \ adduser -S -H -s /usr/sbin/nologin -u ${NETDATA_GID} -h /etc/netdata -G "${DOCKER_GRP}" "${DOCKER_USR}" - # Fix handling of config directory -# Long-term this should leverage BuildKit’s mount option. COPY --from=builder /app / # Apply the permissions as described in @@ -119,21 +127,6 @@ RUN chown -R root:root \ find /var/lib/netdata /var/cache/netdata -type f -exec chmod 0660 {} \; && \ cp -va /etc/netdata /etc/netdata.stock -ENV NETDATA_LISTENER_PORT 19999 -EXPOSE $NETDATA_LISTENER_PORT - -ENV NETDATA_EXTRA_APK_PACKAGES="" - ENTRYPOINT ["/usr/sbin/run.sh"] HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD /usr/sbin/health.sh - -ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false - -LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>" -LABEL org.opencontainers.image.url="https://netdata.cloud" -LABEL org.opencontainers.image.documentation="https://learn.netdata.cloud" -LABEL org.opencontainers.image.source="https://github.com/netdata/netdata" -LABEL org.opencontainers.image.title="Netdata Agent" -LABEL org.opencontainers.image.description="Official Netdata Agent Docker Image" -LABEL org.opencontainers.image.vendor="Netdata Inc." |