From 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jan 2022 23:13:09 +0100 Subject: [PATCH] Hotfix: wrong comment usage --- 2021.09/apache/Dockerfile | 3 ++- 2021.09/fpm-alpine/Dockerfile | 3 ++- 2021.09/fpm/Dockerfile | 3 ++- 2021.12-dev/apache/Dockerfile | 3 ++- 2021.12-dev/fpm-alpine/Dockerfile | 3 ++- 2021.12-dev/fpm/Dockerfile | 3 ++- 2021.12-rc/apache/Dockerfile | 3 ++- 2021.12-rc/fpm-alpine/Dockerfile | 3 ++- 2021.12-rc/fpm/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index 51845a7..15a622d 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -160,7 +160,8 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 38bb081..2e893ee 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -132,7 +132,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 2fba160..1d7d79b 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -151,7 +151,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.09" ENV FRIENDICA_ADDONS "2021.09" ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf" diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index 0a0a2be..d088a56 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2021.12-dev/apache/Dockerfile @@ -160,7 +160,8 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index 9bc61b4..879413a 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2021.12-dev/fpm-alpine/Dockerfile @@ -132,7 +132,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index d0fcb5f..adca04b 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2021.12-dev/fpm/Dockerfile @@ -151,7 +151,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-dev" ENV FRIENDICA_ADDONS "2021.12-dev" diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index aeeae37..66952d4 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2021.12-rc/apache/Dockerfile @@ -160,7 +160,8 @@ RUN set -ex;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index a12850c..ba5d553 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2021.12-rc/fpm-alpine/Dockerfile @@ -132,7 +132,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index 7a1e6be..868ba61 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2021.12-rc/fpm/Dockerfile @@ -151,7 +151,8 @@ RUN set -ex; \ VOLUME /var/www/html -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "2021.12-rc" ENV FRIENDICA_ADDONS "2021.12-rc" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 84665aa..f7fbc2d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -131,7 +131,8 @@ RUN set -ex; \ VOLUME /var/www/html %%VARIANT_EXTRAS%% -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "%%VERSION%%" ENV FRIENDICA_ADDONS "%%VERSION%%" %%DOWNLOAD_SHA256%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 375cc3e..8e32e3b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -150,7 +150,8 @@ RUN set -ex; \ VOLUME /var/www/html %%VARIANT_EXTRAS%% -ENV FRIENDICA_SYSLOG_FLAGS 39 // LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR +ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_VERSION "%%VERSION%%" ENV FRIENDICA_ADDONS "%%VERSION%%" %%DOWNLOAD_SHA256%%