Reverted test-settings and updated README

.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`
+**Note**: If you are on a develop branch (*-dev or *-rc) you have to set the environment variable `FRIENDICA_UPGRADE=true` to update Friendica.

.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

.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_TZ=
-      - FRIENDICA_LANG=de
+      - FRIENDICA_LANG=
-      - SITENAME=Testsite
+      - SITENAME=
-      - SMTP=smtp.philipp.info
+      - SMTP=
     env_file:
       - db.env
     depends_on:

.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/

.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

.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/

.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