From b015f2afe5bc5878ead85250a56451d20e27b149 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Tue, 12 Oct 2021 07:34:03 -0400
Subject: [PATCH] Add POWER8+ support to our official Docker images. (#11592)
* Add POWER8+ support to our official Docker images.
* Update docs about lack of FreeIPMI in POWER8 docker images.
* Update packaging/docker/README.md
Co-authored-by: David Shreve, Jr. <david@netdata.cloud>
Co-authored-by: David Shreve, Jr. <david@netdata.cloud>
---
.github/workflows/docker.yml | 3 ++-
packaging/docker/Dockerfile | 6 ++++--
packaging/docker/README.md | 3 +++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 63a5fc09c8..a410c761c8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,6 +44,7 @@ jobs:
- linux/i386
- linux/arm/v7
- linux/arm64
+ - linux/ppc64le
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -92,7 +93,7 @@ jobs:
- name: Docker Build
uses: docker/build-push-action@v2
with:
- platforms: linux/amd64,linux/i386,linux/arm/v7,linux/arm64
+ platforms: linux/amd64,linux/i386,linux/arm/v7,linux/arm64,linux/ppc64le
push: true
tags: ${{ env.tags }}
- name: Failure Notification
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index c0efb4bfa4..a50c86d047 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -99,8 +99,10 @@ RUN chown -R root:root \
chmod 0755 /usr/libexec/netdata/plugins.d/*.plugin && \
chmod 4755 \
/usr/libexec/netdata/plugins.d/cgroup-network \
- /usr/libexec/netdata/plugins.d/apps.plugin \
- /usr/libexec/netdata/plugins.d/freeipmi.plugin && \
+ /usr/libexec/netdata/plugins.d/apps.plugin && \
+ if [ -f /usr/libexec/netdata/plugins.d/freeipmi.plugin ]; then \
+ chmod 4755 /usr/libexec/netdata/plugins.d/freeipmi.plugin; \
+ fi && \
# Group write permissions due to: https://github.com/netdata/netdata/pull/6543
find /var/lib/netdata /var/cache/netdata -type d -exec chmod 0770 {} \; && \
find /var/lib/netdata /var/cache/netdata -type f -exec chmod 0660 {} \; && \
diff --git a/packaging/docker/README.md b/packaging/docker/README.md
index ed136cfa90..0a4804ae98 100644
--- a/packaging/docker/README.md
+++ b/packaging/docker/README.md
@@ -32,6 +32,9 @@ directive, not a COMMAND directive. Please adapt your execution scripts accordin
ENTRYPOINT vs COMMAND in the [Docker
documentation](https://docs.docker.com/engine/reference/builder/#understand-how-cmd-and-entrypoint-interact).
+Our POWER8+ Docker images do not support our FreeIPMI collector. This is a technical limitation in FreeIPMI itself,
+and unfortunately not something we can realistically work around.
+
## Create a new Netdata Agent container
You can create a new Agent container using either `docker run` or Docker Compose. After using either method, you can