From 83dafd7642487770df645d6953c9c493c9949efc Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 27 Mar 2021 23:44:50 +0100 Subject: [PATCH] Fixing examples - remove supervisord possibility due incompatibility with `tini` - Fix example Dockerfiles --- .examples/README.md | 12 +--------- .../mariadb-cron-redis/apache/app/Dockerfile | 2 +- .../fpm-alpine/app/Dockerfile | 2 +- .../mariadb-cron-redis/fpm/app/Dockerfile | 2 +- .../mariadb-cron-smtp/apache/app/Dockerfile | 4 ++-- .../fpm-alpine/app/Dockerfile | 4 ++-- .../mariadb-cron-smtp/fpm/app/Dockerfile | 4 ++-- .examples/dockerfiles/cron/apache/Dockerfile | 14 ------------ .../dockerfiles/cron/apache/supervisord.conf | 22 ------------------- .examples/dockerfiles/cron/fpm/Dockerfile | 14 ------------ .../dockerfiles/cron/fpm/supervisord.conf | 22 ------------------- 11 files changed, 10 insertions(+), 92 deletions(-) delete mode 100644 .examples/dockerfiles/cron/apache/Dockerfile delete mode 100644 .examples/dockerfiles/cron/apache/supervisord.conf delete mode 100644 .examples/dockerfiles/cron/fpm/Dockerfile delete mode 100644 .examples/dockerfiles/cron/fpm/supervisord.conf diff --git a/.examples/README.md b/.examples/README.md index 7b42478..2411a53 100644 --- a/.examples/README.md +++ b/.examples/README.md @@ -1,22 +1,12 @@ # Examples section In this subfolder are some examples how to use the docker images. -There are two section: +There is currently one section: -* [`dockerfiles`](https://github.com/friendica/docker/tree/stable/.examples/dockerfiles) * [`docker-compose`](https://github.com/friendica/docker/tree/stable/.examples/docker-compose) -The `dockerfiles` are derived images that add or alter certain functionalities of the default docker images. In the `docker-compose` subfolder are examples for deployment of the application. -## Dockerfiles - -The Dockerfiles use the default images as base image and build on top of it. - -Examples | Descriptions --------- | ------- -[cron](https://github.com/friendica/docker/tree/stable/.examples/dockerfiles/cron) | uses supervisor to run the cron job inside the container (so no extra container is needed). - ## docker-compose In `docker-compose` additional services are bundled to create a complex Friendica installation. diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile index ad75fc9..66ea6af 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile @@ -1,4 +1,4 @@ -FROM friendica/server:apache +FROM friendica:apache RUN mkdir -p /usr/src/config COPY addon.config.php /usr/src/config/ diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/Dockerfile index caa1f5a..2b45fea 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/Dockerfile @@ -1,4 +1,4 @@ -FROM friendica/server:fpm-alpine +FROM friendica:fpm-alpine RUN mkdir -p /usr/src/config COPY addon.config.php /usr/src/config/ diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile index 5b7fe1d..25c43f3 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile @@ -1,4 +1,4 @@ -FROM friendica/server:fpm +FROM friendica:fpm RUN mkdir -p /usr/src/config COPY addon.config.php /usr/src/config/ diff --git a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile index 60c60c6..08ae513 100644 --- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile +++ b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile @@ -1,5 +1,5 @@ # Based on .exmples/dockerfiles/smtp/apache -FROM friendica/server:apache +FROM friendica:apache # simple = using an smtp without any credentials (mostly in local networks) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support) @@ -9,4 +9,4 @@ ENV SMTP_HOST smtp.example.org COPY *.sh / RUN chmod +x /*.sh -RUN /smtp-config.sh \ No newline at end of file +RUN /smtp-config.sh diff --git a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/app/Dockerfile b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/app/Dockerfile index dae8782..2290b7a 100644 --- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/app/Dockerfile +++ b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/app/Dockerfile @@ -1,5 +1,5 @@ # Based on .exmples/dockerfiles/smtp/fpm-alpine -FROM friendica/server:fpm-alpine +FROM friendica:fpm-alpine ENV SMTP_HOST smtp.example.org @@ -15,4 +15,4 @@ RUN set -ex; \ # simple = using an smtp without any credentials (mostly in local networks) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support) -ENV SMTP_TYPE simple \ No newline at end of file +ENV SMTP_TYPE simple diff --git a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/app/Dockerfile b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/app/Dockerfile index fcb2911..97fd2c8 100644 --- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/app/Dockerfile +++ b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/app/Dockerfile @@ -1,5 +1,5 @@ # Based on .exmples/dockerfiles/smtp/fpm -FROM friendica/server:fpm +FROM friendica:fpm # simple = using an smtp without any credentials (mostly in local networks) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support) @@ -9,4 +9,4 @@ ENV SMTP_HOST smtp.example.org COPY *.sh / RUN chmod +x /*.sh -RUN /smtp-config.sh \ No newline at end of file +RUN /smtp-config.sh diff --git a/.examples/dockerfiles/cron/apache/Dockerfile b/.examples/dockerfiles/cron/apache/Dockerfile deleted file mode 100644 index 7fb8cec..0000000 --- a/.examples/dockerfiles/cron/apache/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM friendica/server:apache - -RUN set -ex; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - supervisor \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - mkdir /var/log/supervisord /var/run/supervisord - -COPY supervisord.conf /etc/supervisor/supervisord.conf - -CMD ["/usr/bin/supervisord"] diff --git a/.examples/dockerfiles/cron/apache/supervisord.conf b/.examples/dockerfiles/cron/apache/supervisord.conf deleted file mode 100644 index 40757b2..0000000 --- a/.examples/dockerfiles/cron/apache/supervisord.conf +++ /dev/null @@ -1,22 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/var/log/supervisord/supervisord.log -pidfile=/var/run/supervisord/supervisord.pid -childlogdir=/var/log/supervisord/ -logfile_maxbytes=50MB ; maximum size of logfile before rotation -logfile_backups=10 ; number of backed up logfiles -loglevel=error - -[program:apache2] -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -command=apache2-foreground - -[program:cron] -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -command=/cron.sh \ No newline at end of file diff --git a/.examples/dockerfiles/cron/fpm/Dockerfile b/.examples/dockerfiles/cron/fpm/Dockerfile deleted file mode 100644 index afb41d0..0000000 --- a/.examples/dockerfiles/cron/fpm/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM friendica/server:fpm - -RUN set -ex; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - supervisor \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - mkdir /var/log/supervisord /var/run/supervisord - -COPY supervisord.conf /etc/supervisor/supervisord.conf - -CMD ["/usr/bin/supervisord"] diff --git a/.examples/dockerfiles/cron/fpm/supervisord.conf b/.examples/dockerfiles/cron/fpm/supervisord.conf deleted file mode 100644 index 40757b2..0000000 --- a/.examples/dockerfiles/cron/fpm/supervisord.conf +++ /dev/null @@ -1,22 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/var/log/supervisord/supervisord.log -pidfile=/var/run/supervisord/supervisord.pid -childlogdir=/var/log/supervisord/ -logfile_maxbytes=50MB ; maximum size of logfile before rotation -logfile_backups=10 ; number of backed up logfiles -loglevel=error - -[program:apache2] -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -command=apache2-foreground - -[program:cron] -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -command=/cron.sh \ No newline at end of file