From 8c997339dcf53b96fb5465eacdeda88170f06149 Mon Sep 17 00:00:00 2001 From: Feng Xue Date: Thu, 6 Jan 2022 12:16:23 -0800 Subject: [PATCH 1/2] Modified Dockerfile and entrypoint.sh to allow customized commands when running the docker image --- Dockerfile | 4 +--- resources/entrypoint.sh | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57a9577..16a6e31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,9 +62,7 @@ COPY ./resources/entrypoint.sh /fake-systemd-entrypoint.sh COPY resources/snmpd.conf /etc/snmp/snmpd.conf -ENTRYPOINT ["/fake-systemd-entrypoint.sh"] -CMD ["tail", "-f", "/opt/dell/srvadmin/var/log/openmanage/*.xml"] - WORKDIR /opt/dell/srvadmin/bin EXPOSE 1311 161 162 +ENTRYPOINT ["/fake-systemd-entrypoint.sh"] diff --git a/resources/entrypoint.sh b/resources/entrypoint.sh index e0ea255..b39b972 100755 --- a/resources/entrypoint.sh +++ b/resources/entrypoint.sh @@ -28,3 +28,4 @@ if [ "$#" -gt 0 ]; then # Use eval instead of exec so this script remains PID 1 eval "$@" fi +tail -f /opt/dell/srvadmin/var/log/openmanage/*.xml From 73f7bff5039d9c5a8a6f4a53a3506079e459e491 Mon Sep 17 00:00:00 2001 From: Feng Xue Date: Thu, 6 Jan 2022 12:18:25 -0800 Subject: [PATCH 2/2] Added R510 on the compatibility list in README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 741bc39..804f2a4 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ This image has been tested on the following Dell hardware: | Hardware | Status | |---------------------|--------------| +| Dell PowerEdge R510 | OK | | Dell PowerEdge R610 | OK | | Dell PowerEdge R620 | OK | | Dell PowerEdge R710 | OK |