From b3f71af495124432776515f86da6719ade0df3b3 Mon Sep 17 00:00:00 2001 From: Diab Neiroukh Date: Thu, 9 Jan 2020 14:05:36 +0000 Subject: [PATCH] Correct supervisord examples so that the container can start (#925) Inspired by #847, I selected the rootdir as the place for our configuration since we already chuck a few files there as seen by https://github.com/nextcloud/docker/blob/master/17.0/fpm-alpine/Dockerfile#L122. Suggested-by: mikecai Signed-off-by: Diab Neiroukh --- .examples/dockerfiles/cron/apache/Dockerfile | 4 ++-- .examples/dockerfiles/cron/fpm-alpine/Dockerfile | 4 ++-- .examples/dockerfiles/cron/fpm/Dockerfile | 4 ++-- .examples/dockerfiles/full/apache/Dockerfile | 4 ++-- .examples/dockerfiles/full/fpm-alpine/Dockerfile | 4 ++-- .examples/dockerfiles/full/fpm/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.examples/dockerfiles/cron/apache/Dockerfile b/.examples/dockerfiles/cron/apache/Dockerfile index 85445b54..5a639ddd 100644 --- a/.examples/dockerfiles/cron/apache/Dockerfile +++ b/.examples/dockerfiles/cron/apache/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* \ && mkdir /var/log/supervisord /var/run/supervisord -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/.examples/dockerfiles/cron/fpm-alpine/Dockerfile b/.examples/dockerfiles/cron/fpm-alpine/Dockerfile index 820b3f9a..2c13a1e9 100644 --- a/.examples/dockerfiles/cron/fpm-alpine/Dockerfile +++ b/.examples/dockerfiles/cron/fpm-alpine/Dockerfile @@ -3,8 +3,8 @@ FROM nextcloud:fpm-alpine RUN apk add --no-cache supervisor \ && mkdir /var/log/supervisord /var/run/supervisord -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/.examples/dockerfiles/cron/fpm/Dockerfile b/.examples/dockerfiles/cron/fpm/Dockerfile index 5bf88ffd..a9e706a4 100644 --- a/.examples/dockerfiles/cron/fpm/Dockerfile +++ b/.examples/dockerfiles/cron/fpm/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* \ && mkdir /var/log/supervisord /var/run/supervisord -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile index eff7c40c..bb0ca6d4 100644 --- a/.examples/dockerfiles/full/apache/Dockerfile +++ b/.examples/dockerfiles/full/apache/Dockerfile @@ -52,8 +52,8 @@ RUN mkdir -p \ /var/run/supervisord \ ; -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/.examples/dockerfiles/full/fpm-alpine/Dockerfile b/.examples/dockerfiles/full/fpm-alpine/Dockerfile index 2603d802..cd0a947e 100644 --- a/.examples/dockerfiles/full/fpm-alpine/Dockerfile +++ b/.examples/dockerfiles/full/fpm-alpine/Dockerfile @@ -44,8 +44,8 @@ RUN mkdir -p \ /var/run/supervisord \ ; -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile index abc07179..6e90b097 100644 --- a/.examples/dockerfiles/full/fpm/Dockerfile +++ b/.examples/dockerfiles/full/fpm/Dockerfile @@ -52,8 +52,8 @@ RUN mkdir -p \ /var/run/supervisord \ ; -COPY supervisord.conf /etc/supervisor/supervisord.conf +COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]