Merge pull request #1765 from greenbone/mergify/bp/stable/pr-1764

Flexible-docker-entrypoint (backport #1764)
greenbone · Dec 13, 2021 · 1846370 · 1846370
2 parents 31ef2dc + 80d4b4b
commit 1846370
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec gosu gvmd "$@"
diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
@@ -85,6 +85,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     dpkg \
     fakeroot \
+    gosu \
     gnupg \
     gpgsm \
     libgpgme11 \
@@ -111,18 +112,21 @@ RUN apt-get update && \
 COPY --from=builder /install/ /
 
 COPY .docker/start-gvmd.sh /usr/local/bin/start-gvmd
+COPY .docker/entrypoint.sh /usr/local/bin/entrypoint
 
 RUN addgroup --gid 1001 --system gvmd && \
     adduser --no-create-home --shell /bin/false --disabled-password --uid 1001 --system --group gvmd
 
 RUN mkdir -p /run/gvmd && \
+    mkdir -p /var/lib/gvm && \
     mkdir -p /var/log/gvm && \
     chown -R gvmd:gvmd /etc/gvm && \
     chown -R gvmd:gvmd /run/gvmd && \
     chown -R gvmd:gvmd /var/lib/gvm && \
     chown -R gvmd:gvmd /var/log/gvm && \
+    chmod 755 /usr/local/bin/entrypoint && \
     chmod 755 /usr/local/bin/start-gvmd
 
-USER gvmd
+ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
 
 CMD [ "/usr/local/bin/start-gvmd" ]