diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 14:45:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 14:48:03 +0000 |
| commit | e55403ed71282d7bfd8b56df219de3c28a8af064 (patch) | |
| tree | 524889e5becb81643bf8741e3082955dca076f09 /packaging/docker/Dockerfile | |
| parent | Releasing debian version 1.47.5-1. (diff) | |
| download | netdata-e55403ed71282d7bfd8b56df219de3c28a8af064.tar.xz netdata-e55403ed71282d7bfd8b56df219de3c28a8af064.zip | |
Merging upstream version 2.0.3+dfsg:
- does not include dygraphs anymore (Closes: #923993)
- does not include pako anymore (Closes: #1042533)
- does not include dashboard binaries anymore (Closes: #1045145)
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/docker/Dockerfile')
| -rw-r--r-- | packaging/docker/Dockerfile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b12af313d..bbc223a20 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -3,7 +3,7 @@ # This image contains preinstalled dependencies # hadolint ignore=DL3007 -FROM netdata/builder:v2 as builder +FROM netdata/builder:v2 AS builder # One of 'nightly' or 'stable' ARG RELEASE_CHANNEL=nightly @@ -47,7 +47,6 @@ RUN mkdir -p /app/usr/sbin/ \ mv /var/lib/netdata /app/var/lib/ && \ mv /etc/netdata /app/etc/ && \ mv /usr/sbin/netdata /app/usr/sbin/ && \ - mv /usr/sbin/netdata-claim.sh /app/usr/sbin/ && \ mv /usr/sbin/netdatacli /app/usr/sbin/ && \ mv /usr/sbin/systemd-cat-native /app/usr/sbin/ && \ mv packaging/docker/run.sh /app/usr/sbin/ && \ @@ -60,7 +59,7 @@ RUN mkdir -p /app/usr/sbin/ \ ##################################################################### # This image contains preinstalled dependencies # hadolint ignore=DL3007 -FROM netdata/base:v2 as base +FROM netdata/base:v2 AS base LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>" LABEL org.opencontainers.image.url="https://netdata.cloud" @@ -77,11 +76,11 @@ ONBUILD ENV NETDATA_OFFICIAL_IMAGE=false ARG NETDATA_UID=201 ARG NETDATA_GID=201 -ENV DOCKER_GRP netdata -ENV DOCKER_USR netdata +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 +ENV NETDATA_LISTENER_PORT=19999 EXPOSE $NETDATA_LISTENER_PORT ENV NETDATA_EXTRA_DEB_PACKAGES="" |