From b9647b03087c542a8de7dce43d3fae5c76352381 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Fri, 5 Oct 2018 21:10:53 +0200 Subject: [PATCH] Reverted test-settings and updated README --- .examples/README.md | 8 ++-- .../insecure/mariadb-cron-redis/apache/db.env | 2 +- .../apache/docker-compose.yml | 8 ++-- .../fpm-alpine/app/Dockerfile | 32 ---------------- .../fpm-alpine/docker-compose.yml | 6 --- .../mariadb-cron-redis/fpm/app/Dockerfile | 37 ------------------- .../mariadb-cron-redis/fpm/docker-compose.yml | 6 --- 7 files changed, 9 insertions(+), 90 deletions(-) diff --git a/.examples/README.md b/.examples/README.md index 9e33436..1edefea 100644 --- a/.examples/README.md +++ b/.examples/README.md @@ -30,18 +30,18 @@ when running docker-compose on the same host as the docker daemon, another possi ### insecure -This examples should only be used for **testing** on the local network because it uses a unencrypted http connection. +These examples should only be used for **testing** on the local network because they use an unencrypted http connection. When you want to have your server reachable from the internet adding HTTPS-encryption is mandatory! For this use one of the [with-traefik-proxy](#with-traefik-proxy) examples. -To use this example complete the following steps: +To use one of these examples, complete the following steps: 1. choose a password for the database user in `db.env` behind `MYSQL_PASSWORD=` 2. run `docker-compose build --pull` to pull the mose recent base images and build the custom dockerfiles 3. start Friendica with `docker-compose up -d` If you want to update your installation to a newer version, repeat 3 and 4. -**Note**: If you are on a develop branch (*-dev or *-rc) you have to update Friendica with the command `docker-compose exec app friendica update` +**Note**: If you are on a develop branch (*-dev or *-rc) you have to set the environment variable `FRIENDICA_UPGRADE=true` to update Friendica. ### with-traefik-proxy @@ -65,4 +65,4 @@ To use this example complete the following steps: 5. start Friendica with `docker-compose up -d` If you want to update your installation to a newer version, repeat 4 and 5. -**Note**: If you are on a develop branch (*-dev or *-rc) you have to update Friendica with the command `docker-compose exec app friendica update` \ No newline at end of file +**Note**: If you are on a develop branch (*-dev or *-rc) you have to set the environment variable `FRIENDICA_UPGRADE=true` to update Friendica. diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env index 44af555..17c0d1e 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env @@ -1,4 +1,4 @@ -MYSQL_PASSWORD=test +MYSQL_PASSWORD= MYSQL_DATABASE=friendica MYSQL_USER=friendica MYSQL_HOST=db diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml index 6be6f8b..d9692eb 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml @@ -22,10 +22,10 @@ services: - friendica:/var/www/html environment: - FRIENDICA_ADMIN_MAIL= - - FRIENDICA_TZ=Europe/Berlin - - FRIENDICA_LANG=de - - SITENAME=Testsite - - SMTP=smtp.philipp.info + - FRIENDICA_TZ= + - FRIENDICA_LANG= + - SITENAME= + - SMTP= env_file: - db.env depends_on: 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 59186fe..95ef463 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,36 +1,4 @@ FROM friendica/server:fpm-alpine -RUN set -ex; \ - apk add --no-cache \ - # For mail() support - ssmtp; - -ENV SMTP localhost -ENV SMTP_FROM no-reply - -ENV SITENAME "Testsite" - -# Setup SSMTP -RUN set -ex; \ - sed -i "s/:root:/:${SITENAME}:/g" /etc/passwd ;\ - sed -i "s/:Linux\ User:/:${SITENAME}:/g" /etc/passwd ;\ -# add possible mail-senders - {\ - echo "www-data:$SMTP_FROM@$HOSTNAME:$SMTP" ;\ - echo "root:$SMTP_FROM@$HOSTNAME:$SMTP" ;\ - } > /etc/ssmtp/revaliases;\ -# replace ssmtp.conf settings - {\ - echo "root=$SMTP_FROM@$HOSTNAME" ;\ - echo "hostname=$HOSTNAME" ;\ - echo "mailhub=$SMTP" ;\ - echo "FromLineOverride=YES" ;\ - [ -z "$SMTP_TLS" ] || echo "UseTLS=$SMTP_TLS" ;\ - [ -z "$SMTP_STARTTLS" ] || echo "UseSTARTTLS=$SMTP_STARTTLS" ;\ - [ -z "$SMTP_AUTH_USER" ] || echo "AuthUser=$SMTP_AUTH_USER" ;\ - [ -z "$SMTP_AUTH_PASS" ] || echo "AuthPass=$SMTP_AUTH_PASS" ;\ - [ -z "$SMTP_AUTH_METHOD" ] || echo "AuthMethod=$SMTP_AUTH_METHOD" ;\ - } > /etc/ssmtp/ssmtp.conf; - RUN mkdir -p /usr/src/config COPY addon.ini.php /usr/src/config/ diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml index 35c82dd..949fb36 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml @@ -38,12 +38,6 @@ services: volumes: - friendica:/var/www/html entrypoint: /cron.sh - environment: - - FRIENDICA_ADMIN_MAIL= - - FRIENDICA_TZ= - - FRIENDICA_LANG= - - SITENAME= - - SMTP= depends_on: - db - app 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 c8b6d12..ccbe350 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile @@ -1,41 +1,4 @@ FROM friendica/server:fpm -# entrypoint.sh and cron.sh dependencies -RUN set -ex; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ -# For mail() support - ssmtp \ - ; \ - rm -rf /var/lib/apt/lists/*; - -ENV SMTP localhost -ENV SMTP_FROM no-reply - -ENV SITENAME "Testsite" - -# Setup SSMTP -RUN set -ex; \ - sed -i "s/:root:/:${SITENAME}:/g" /etc/passwd ;\ - sed -i "s/:Linux\ User:/:${SITENAME}:/g" /etc/passwd ;\ -# add possible mail-senders - {\ - echo "www-data:$SMTP_FROM@$HOSTNAME:$SMTP" ;\ - echo "root:$SMTP_FROM@$HOSTNAME:$SMTP" ;\ - } > /etc/ssmtp/revaliases;\ -# replace ssmtp.conf settings - {\ - echo "root=$SMTP_FROM@$HOSTNAME" ;\ - echo "hostname=$HOSTNAME" ;\ - echo "mailhub=$SMTP" ;\ - echo "FromLineOverride=YES" ;\ - [ -z "$SMTP_TLS" ] || echo "UseTLS=$SMTP_TLS" ;\ - [ -z "$SMTP_STARTTLS" ] || echo "UseSTARTTLS=$SMTP_STARTTLS" ;\ - [ -z "$SMTP_AUTH_USER" ] || echo "AuthUser=$SMTP_AUTH_USER" ;\ - [ -z "$SMTP_AUTH_PASS" ] || echo "AuthPass=$SMTP_AUTH_PASS" ;\ - [ -z "$SMTP_AUTH_METHOD" ] || echo "AuthMethod=$SMTP_AUTH_METHOD" ;\ - } > /etc/ssmtp/ssmtp.conf; - RUN mkdir -p /usr/src/config COPY addon.ini.php /usr/src/config/ diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml index 62b89c5..e78af22 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml @@ -38,12 +38,6 @@ services: volumes: - friendica:/var/www/html entrypoint: /cron.sh - environment: - - FRIENDICA_ADMIN_MAIL= - - FRIENDICA_TZ= - - FRIENDICA_LANG= - - SITENAME= - - SMTP= depends_on: - db - app