Assorted Dockerfile cleanup. (#15902)
- Drop old, pointless comments. - Reorganize so that invariant layers are first, making build caching more efficient.
Austin S. Hemmelgarn committed
Sep 5, 2023 at 06:24 UTC
6efd6b7fe1737eaead41b5659c003bfe6f248774
1 file changed
+14
-21
packaging/docker/Dockerfile
+14
-21
@@ -61,31 +61,39 @@ RUN mkdir -p /app/usr/sbin/ \
61
# hadolint ignore=DL3007
62
FROM netdata/base:latest as base
63
64
+LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
65
+LABEL org.opencontainers.image.url="https://netdata.cloud"
66
+LABEL org.opencontainers.image.documentation="https://learn.netdata.cloud"
67
+LABEL org.opencontainers.image.source="https://github.com/netdata/netdata"
68
+LABEL org.opencontainers.image.title="Netdata Agent"
69
+LABEL org.opencontainers.image.description="Official Netdata Agent Docker Image"
70
+LABEL org.opencontainers.image.vendor="Netdata Inc."
71
+
72
ARG OFFICIAL_IMAGE=false
73
ENV NETDATA_OFFICIAL_IMAGE=$OFFICIAL_IMAGE
74
67
-# Configure system
75
+ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false
76
+
77
ARG NETDATA_UID=201
78
ARG NETDATA_GID=201
79
ENV DOCKER_GRP netdata
80
ENV DOCKER_USR netdata
81
# If DISABLE_TELEMETRY is set, it will disable anonymous stats collection and reporting
82
#ENV DISABLE_TELEMETRY=1
83
+ENV NETDATA_LISTENER_PORT 19999
84
+EXPOSE $NETDATA_LISTENER_PORT
85
+
86
+ENV NETDATA_EXTRA_APK_PACKAGES=""
87
75
-# Copy files over
88
RUN mkdir -p /opt/src /var/log/netdata && \
77
- # Link log files to stdout
89
ln -sf /dev/stdout /var/log/netdata/access.log && \
90
ln -sf /dev/stdout /var/log/netdata/debug.log && \
91
ln -sf /dev/stderr /var/log/netdata/error.log && \
92
ln -sf /dev/stdout /var/log/netdata/collector.log && \
93
ln -sf /dev/stdout /var/log/netdata/health.log && \
83
- # Add netdata user
94
addgroup -g ${NETDATA_GID} -S "${DOCKER_GRP}" && \
95
adduser -S -H -s /usr/sbin/nologin -u ${NETDATA_GID} -h /etc/netdata -G "${DOCKER_GRP}" "${DOCKER_USR}"
86
- # Fix handling of config directory
96
88
-# Long-term this should leverage BuildKit’s mount option.
97
COPY --from=builder /app /
98
99
# Apply the permissions as described in
@@ -119,21 +127,6 @@ RUN chown -R root:root \
127
find /var/lib/netdata /var/cache/netdata -type f -exec chmod 0660 {} \; && \
128
cp -va /etc/netdata /etc/netdata.stock
129
122
-ENV NETDATA_LISTENER_PORT 19999
123
-EXPOSE $NETDATA_LISTENER_PORT
124
-
125
-ENV NETDATA_EXTRA_APK_PACKAGES=""
126
-
130
ENTRYPOINT ["/usr/sbin/run.sh"]
131
132
HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD /usr/sbin/health.sh
130
-
131
-ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false
132
-
133
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
134
-LABEL org.opencontainers.image.url="https://netdata.cloud"
135
-LABEL org.opencontainers.image.documentation="https://learn.netdata.cloud"
136
-LABEL org.opencontainers.image.source="https://github.com/netdata/netdata"
137
-LABEL org.opencontainers.image.title="Netdata Agent"
138
-LABEL org.opencontainers.image.description="Official Netdata Agent Docker Image"
139
-LABEL org.opencontainers.image.vendor="Netdata Inc."