adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct supervisord examples so that the container can start (#925)

Browse Source 
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 <mikecai@us.ibm.com>
Signed-off-by: Diab Neiroukh <officiallazerl0rd@gmail.com>
This commit is contained in:
Diab Neiroukh 2020-01-09 14:05:36 +00:00 committed by J0WI
parent a3a21c2de7
commit b3f71af495
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.examples/dockerfiles/cron/apache/Dockerfile
View File

@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/cron/fpm-alpine/Dockerfile
View File

@ -3,8 +3,8 @@ FROM nextcloud:fpm-alpine
RUN apk add --no-cache supervisor \ RUN apk add --no-cache supervisor \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/cron/fpm/Dockerfile
View File

@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir /var/log/supervisord /var/run/supervisord && mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/full/apache/Dockerfile
View File

@ -52,8 +52,8 @@ RUN mkdir -p \
/var/run/supervisord \ /var/run/supervisord \
; ;
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/full/fpm-alpine/Dockerfile
View File

@ -44,8 +44,8 @@ RUN mkdir -p \
/var/run/supervisord \ /var/run/supervisord \
; ;
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/full/fpm/Dockerfile
View File

@ -52,8 +52,8 @@ RUN mkdir -p \
/var/run/supervisord \ /var/run/supervisord \
; ;
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1 ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]