From 36817b11ff85455646726879f2d1facd25f11bd0 Mon Sep 17 00:00:00 2001 From: Brent Boe Date: Mon, 17 Jun 2019 18:45:37 -0700 Subject: [PATCH 1/3] Seems to cause an issue with downstream images --- splunk/common-files/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splunk/common-files/Dockerfile b/splunk/common-files/Dockerfile index 4906ce04..33e699a5 100644 --- a/splunk/common-files/Dockerfile +++ b/splunk/common-files/Dockerfile @@ -55,7 +55,7 @@ COPY [ "splunk/common-files/updateetc.sh", "/sbin/" ] # Setup users and groups RUN groupadd -r -g ${GID} ${SPLUNK_GROUP} \ - && useradd -r -m -u ${UID} -g ${GID} -s /sbin/nologin -d ${SPLUNK_HOME} ${SPLUNK_USER} \ + && useradd -r -m -u ${UID} -g ${GID} ${SPLUNK_USER} \ && chown -R splunk.splunk ${SPLUNK_HOME} \ && chmod 755 /sbin/updateetc.sh From 2501c9fe51ce3a6c8af15c86b721d3f24c64dc2a Mon Sep 17 00:00:00 2001 From: Brent Boe Date: Mon, 17 Jun 2019 20:50:37 -0700 Subject: [PATCH 2/3] removing chown --- splunk/common-files/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/splunk/common-files/Dockerfile b/splunk/common-files/Dockerfile index 33e699a5..f3d4702d 100644 --- a/splunk/common-files/Dockerfile +++ b/splunk/common-files/Dockerfile @@ -56,7 +56,6 @@ COPY [ "splunk/common-files/updateetc.sh", "/sbin/" ] # Setup users and groups RUN groupadd -r -g ${GID} ${SPLUNK_GROUP} \ && useradd -r -m -u ${UID} -g ${GID} ${SPLUNK_USER} \ - && chown -R splunk.splunk ${SPLUNK_HOME} \ && chmod 755 /sbin/updateetc.sh COPY --from=package --chown=splunk:splunk /minimal /opt From 8f2fc485339e35d8aebd437dd6798654a850f291 Mon Sep 17 00:00:00 2001 From: Brent Boe Date: Wed, 19 Jun 2019 18:25:43 -0700 Subject: [PATCH 3/3] Not too thrilled about this, maybe we should change the splunk and ansible to use the same group --- splunk/common-files/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/splunk/common-files/Dockerfile b/splunk/common-files/Dockerfile index f3d4702d..9c70e0ac 100644 --- a/splunk/common-files/Dockerfile +++ b/splunk/common-files/Dockerfile @@ -105,6 +105,7 @@ RUN sed -i -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' / && mkdir ${CONTAINER_ARTIFACT_DIR} \ && chown -R ${ANSIBLE_USER}:${ANSIBLE_GROUP} $CONTAINER_ARTIFACT_DIR \ && chmod -R 555 ${SPLUNK_ANSIBLE_HOME} \ + && chmod -R 777 ${CONTAINER_ARTIFACT_DIR} \ && chmod 755 /sbin/entrypoint.sh /sbin/createdefaults.py /sbin/checkstate.sh USER ${ANSIBLE_USER}