From d9e7f6d378766d6db7ca23617cb65e693662a05a Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 17 Jan 2021 12:17:26 -0800 Subject: [PATCH] Fix ENTRYPOINT for admin, ci images --- docker/admin/Dockerfile | 2 +- docker/ci/Dockerfile | 2 +- docker/shared/admin-pid1.bash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/admin/Dockerfile b/docker/admin/Dockerfile index 75d58e6..57dc511 100644 --- a/docker/admin/Dockerfile +++ b/docker/admin/Dockerfile @@ -6,5 +6,5 @@ RUN /tmp/install.bash WORKDIR /src COPY docker/shared/my_init /usr/local/sbin/ COPY docker/shared/admin-pid1.bash /usr/local/sbin/pid1.bash -ENTRYPOINT ["/usr/local/sbin/my_init", "/usr/local/sbin/pid1.bash"] +ENTRYPOINT ["/usr/local/sbin/my_init", "/usr/local/sbin/pid1.bash", "--"] CMD ["bash"] diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index ee0fa01..c23d745 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -6,5 +6,5 @@ RUN /tmp/install.bash WORKDIR /src COPY docker/shared/my_init /usr/local/sbin/ COPY docker/shared/admin-pid1.bash /usr/local/sbin/pid1.bash -ENTRYPOINT ["/usr/local/sbin/my_init", "/usr/local/sbin/pid1.bash"] +ENTRYPOINT ["/usr/local/sbin/my_init", "/usr/local/sbin/pid1.bash", "--"] CMD ["bash"] diff --git a/docker/shared/admin-pid1.bash b/docker/shared/admin-pid1.bash index e100217..6fee836 100755 --- a/docker/shared/admin-pid1.bash +++ b/docker/shared/admin-pid1.bash @@ -19,4 +19,4 @@ EOF runuser -u riju -- yarn install -exec runuser -u riju "$@" +exec runuser -u riju -- "$@"