aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2018-03-19 22:22:12 +0100
committerGitHub <noreply@github.com>2018-03-19 22:22:12 +0100
commite54cb1bbe7500d5271d767a298cefbc85f904e0d (patch)
treecb6a5b6b9c3567cd6f10df1ce469d36ce509caeb
parent60a94dab22b6ff1fe414ba98b90dbaaf741cadef (diff)
parent017baf57d50b63cd32dce44e7b953f6ac6380c0b (diff)
downloadShaarli-e54cb1bbe7500d5271d767a298cefbc85f904e0d.tar.gz
Shaarli-e54cb1bbe7500d5271d767a298cefbc85f904e0d.tar.zst
Shaarli-e54cb1bbe7500d5271d767a298cefbc85f904e0d.zip
Merge pull request #1100 from Angristan/docker-logs
Nginx logs to stdout for Docker images
-rw-r--r--docker/alpine/Dockerfile.armhf.latest4
-rw-r--r--docker/alpine/Dockerfile.armhf.master4
-rw-r--r--docker/alpine/Dockerfile.latest5
-rw-r--r--docker/alpine/Dockerfile.master5
4 files changed, 14 insertions, 4 deletions
diff --git a/docker/alpine/Dockerfile.armhf.latest b/docker/alpine/Dockerfile.armhf.latest
index c923834a..824a1926 100644
--- a/docker/alpine/Dockerfile.armhf.latest
+++ b/docker/alpine/Dockerfile.armhf.latest
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf -
37 && cd shaarli \ 37 && cd shaarli \
38 && composer --prefer-dist --no-dev install \ 38 && composer --prefer-dist --no-dev install \
39 && rm -rf ~/.composer \ 39 && rm -rf ~/.composer \
40 && chown -R nginx:nginx . 40 && chown -R nginx:nginx . \
41 && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
42 && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
41 43
42VOLUME /var/www/shaarli/data 44VOLUME /var/www/shaarli/data
43 45
diff --git a/docker/alpine/Dockerfile.armhf.master b/docker/alpine/Dockerfile.armhf.master
index 7f1bdf85..6c89adc3 100644
--- a/docker/alpine/Dockerfile.armhf.master
+++ b/docker/alpine/Dockerfile.armhf.master
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf -
37 && cd shaarli \ 37 && cd shaarli \
38 && composer --prefer-dist --no-dev install \ 38 && composer --prefer-dist --no-dev install \
39 && rm -rf ~/.composer \ 39 && rm -rf ~/.composer \
40 && chown -R nginx:nginx . 40 && chown -R nginx:nginx . \
41 && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
42 && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
41 43
42VOLUME /var/www/shaarli/data 44VOLUME /var/www/shaarli/data
43 45
diff --git a/docker/alpine/Dockerfile.latest b/docker/alpine/Dockerfile.latest
index 4724b633..755d8751 100644
--- a/docker/alpine/Dockerfile.latest
+++ b/docker/alpine/Dockerfile.latest
@@ -42,7 +42,10 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
42WORKDIR /var/www 42WORKDIR /var/www
43COPY --from=composer /app/shaarli shaarli 43COPY --from=composer /app/shaarli shaarli
44 44
45RUN chown -R nginx:nginx . 45RUN chown -R nginx:nginx . \
46 && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
47 && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
48
46VOLUME /var/www/shaarli/data 49VOLUME /var/www/shaarli/data
47 50
48EXPOSE 80 51EXPOSE 80
diff --git a/docker/alpine/Dockerfile.master b/docker/alpine/Dockerfile.master
index 9cb4dec4..0472947f 100644
--- a/docker/alpine/Dockerfile.master
+++ b/docker/alpine/Dockerfile.master
@@ -42,7 +42,10 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
42WORKDIR /var/www 42WORKDIR /var/www
43COPY --from=composer /app/shaarli shaarli 43COPY --from=composer /app/shaarli shaarli
44 44
45RUN chown -R nginx:nginx . 45RUN chown -R nginx:nginx . \
46 && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
47 && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
48
46VOLUME /var/www/shaarli/data 49VOLUME /var/www/shaarli/data
47 50
48EXPOSE 80 51EXPOSE 80