From 58e4a6dcaa9736a0e9029ee18e236b71ffa8755b Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 22 May 2018 11:04:03 +0200
Subject: [PATCH 1/2] Add Friendica docs

---
 friendica/README-short.txt |   1 +
 friendica/content.md       | 157 +++++++++++++++++++++++++++++++++++++
 friendica/github-repo      |   1 +
 friendica/license.md       |   1 +
 friendica/logo.png         | Bin 0 -> 6453 bytes
 friendica/maintainer.md    |   1 +
 6 files changed, 161 insertions(+)
 create mode 100644 friendica/README-short.txt
 create mode 100644 friendica/content.md
 create mode 100644 friendica/github-repo
 create mode 100644 friendica/license.md
 create mode 100644 friendica/logo.png
 create mode 100644 friendica/maintainer.md

diff --git a/friendica/README-short.txt b/friendica/README-short.txt
new file mode 100644
index 000000000000..4dd8c56efe00
--- /dev/null
+++ b/friendica/README-short.txt
@@ -0,0 +1 @@
+Welcome to the free social web.
diff --git a/friendica/content.md b/friendica/content.md
new file mode 100644
index 000000000000..bdb9eac96696
--- /dev/null
+++ b/friendica/content.md
@@ -0,0 +1,157 @@
+# Docker Image for Friendica
+[![Build Status Travis](https://travis-ci.org/friendica/docker.svg?branch=master)](https://travis-ci.org/friendica/docker)
+
+This repository holds the official Docker Image for [Friendica](https://friendi.ca)
+
+# What is Friendica?
+
+Friendica is a decentralised communications platform that integrates social communication.
+Our platform links to independent social projects and corporate services.
+
+![logo](https://cdn.rawgit.com/nupplaphil/friendica-docker/c59f235f/friendica.svg)
+
+# How to use this image
+The images are designed to be used in a micro-service environment.
+There are two types of the image you can choose from.
+
+The `apache` tag contains a full Friendica installation including an apache web server. 
+It is designed to be easy to use and gets you running pretty fast.
+This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container.
+It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Friendica server.
+To use this image it must be combined with any Webserver that can proxy the http requests to the FastCGI-port of the container.
+
+## Using the apache image
+You need at least one other mariadb/mysql-container to link it to Friendica.
+
+The apache image contains a webserver and exposes port 80.
+To start the container type:
+```console
+$ docker run -d -p 8080:80 --link some-mysql:mysql friendica
+```
+
+Now you can access the Friendica installation wizard at http://localhost:8080/ from your host system.
+
+## Using the fpm image
+To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container.
+For fpm connection this container exposes port 9000.
+In most cases you might want use another container or your host as proxy.
+If you use your host you can address your Friendica container directly on port 9000.
+If you use another container, make sure that you add them to the same docker network (via `docker run --network <NAME> ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to you host. 
+
+```console
+$ docker run -d friendica:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files.
+This can be achieved with the `volumes-from` option.
+You can find more information in the docker-compose section.
+
+## Using the cron job
+
+There are three options to enable the cron-job for Friendica:
+- Using the default Image and activate the cron-job (see [Installation](https://friendi.ca/resources/installation/), sector `Activating scheduled tasks`)
+- Using the default image (apache, fpm, fpm-alpine) and creating **two** container (one for cron and one for the main app)
+- Using one of the additional, prepared [`cron dockerfiles`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/cron)
+
+## Using sendmail for E-Mail support
+
+You have to set the `--hostname/-h` parameter correctly to make the `mail()` command use the right domainname of it's e-mail.
+Currently, the command `sendmail` will be used for the `mail()` support of Friendica.
+
+Be aware that in production environment, you normally have an external MTA (or a SmartHost) for correctly signing and routing your e-mails.
+See the Dockerfiles at [`smtp`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/smtp) for examples how to configure it.
+
+### `apache` and `fpm` image
+`sendmail` is used as a SMTP MTA for standalone usage and it works out-of-the-box.
+
+### `fpm-alpine` image
+For alpine, there is no "standalone" mail-service available.
+Therefore you **have** to setup a SMTP MTA.
+
+## Using an external database
+By default the `latest` container uses a local MySQL-Database for data storage, but the Friendica setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB database.
+You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup.
+
+## Persistent data
+The Friendica installation and all data beyond what lives in the database (file uploads, etc) is stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`.
+The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`.
+That means your data is saved even if the container crashes, is stopped or deleted.
+
+To make your data persistent to upgrading and get access for backups is using named docker volume or mount a host folder.
+To achieve this you need one volume for your database container and Friendica.
+
+Friendica:
+- `/var/www/html/` folder where all Friendica data lives
+```console
+$ docker run -d \
+-v friendica-vol-1:/var/www/html \
+friendica
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+```console
+$ docker run -d \
+-v mysql-vol-1:/var/lib/mysql \
+mariadb
+```
+
+## Auto configuration via environment variables
+The Friendica image supports auto configuration via environment variables.
+You can preconfigure everything that is asked on the install page on first run. 
+
+- `AUTOINSTALL` if `true`, the automatic configuration will start (Default: `false`)
+
+__MYSQL/MariaDB__:
+- `MYSQL_USERNAME` Username for the database user using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+- `MYSQL_PORT` Port of the database server using mysql / mariadb.
+
+You can also predefine the following `.htconfig.php` values:
+- `MAILNAME` E-Mail address of the administrator
+- `TZ` The default localization of the Friendica server
+- `LANGUAGE` The default language of the Friendica server
+- `SITENAME` The default name of the Friendica server
+
+## Updating Friendica
+
+There are differences between the [stable](https://github.com/friendica/docker/tree/master/stable/) and the [develop](https://github.com/friendica/docker/tree/master/develop/) branches.
+
+They have both in common that normally we do not automatically overwrite your working directory with the new version.
+Instead you need to explicit run `friendica update` for the node for updating files&database.
+
+## Updating stable 
+You have to pull the latest image from the hub (`docker pull friendica`).
+
+## Updating develop
+You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/).
+Instead you can just update your node with executing `friendica update` on the node.
+Example:
+```console
+$ docker exec -ti friendica_running_node friendica update
+```
+It will clone the latest Friendica version and copy it to your working directory.
+
+# The `friendica` CLI
+
+To make the usage of the Docker images smooth, we created a little CLI.
+It wraps the common commands for Friendica and adds new commands.
+
+You can call it with
+```console
+$ docker exec -ti friendica_running_node friendica <command>
+```
+
+Commands:
+- `console` Executes an command in the Friendica console (`bin/console.php` wrapper)
+- `composer` Executes the composer.phar executable for Friendica (`bin/composer.phar` wrapper)
+- `install` Installs Friendica on a empty environment (gets called automatically during first start) 
+- `update` Updates Friendica on a **existing** environment
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/friendica/docker) and write an issue. 
\ No newline at end of file
diff --git a/friendica/github-repo b/friendica/github-repo
new file mode 100644
index 000000000000..488349611464
--- /dev/null
+++ b/friendica/github-repo
@@ -0,0 +1 @@
+https://github.com/friendica/docker
diff --git a/friendica/license.md b/friendica/license.md
new file mode 100644
index 000000000000..f93b63648837
--- /dev/null
+++ b/friendica/license.md
@@ -0,0 +1 @@
+View [license information](https://github.com/friendica/docker/blob/master/LICENSE) for the software contained in this image.
diff --git a/friendica/logo.png b/friendica/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2792ab54ebeb1b34dcb18e3c6b35d9b568743ec
GIT binary patch
literal 6453
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
AnE(I)

literal 0
HcmV?d00001

diff --git a/friendica/maintainer.md b/friendica/maintainer.md
new file mode 100644
index 000000000000..284cf3830723
--- /dev/null
+++ b/friendica/maintainer.md
@@ -0,0 +1 @@
+[Friendica](%%GITHUB-REPO%%)

From 71d2e0cd60edce11a988ad867acc68dbf66df107 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 22 May 2018 12:12:08 +0200
Subject: [PATCH 2/2] fixed `contend.md` (markdownfmt checks)

---
 friendica/content.md | 138 ++++++++++++++++++++-----------------------
 1 file changed, 64 insertions(+), 74 deletions(-)

diff --git a/friendica/content.md b/friendica/content.md
index bdb9eac96696..aee2921c26d3 100644
--- a/friendica/content.md
+++ b/friendica/content.md
@@ -1,32 +1,21 @@
-# Docker Image for Friendica
-[![Build Status Travis](https://travis-ci.org/friendica/docker.svg?branch=master)](https://travis-ci.org/friendica/docker)
-
-This repository holds the official Docker Image for [Friendica](https://friendi.ca)
-
 # What is Friendica?
 
-Friendica is a decentralised communications platform that integrates social communication.
-Our platform links to independent social projects and corporate services.
+Friendica is a decentralised communications platform that integrates social communication. Our platform links to independent social projects and corporate services.
 
 ![logo](https://cdn.rawgit.com/nupplaphil/friendica-docker/c59f235f/friendica.svg)
 
 # How to use this image
-The images are designed to be used in a micro-service environment.
-There are two types of the image you can choose from.
 
-The `apache` tag contains a full Friendica installation including an apache web server. 
-It is designed to be easy to use and gets you running pretty fast.
-This is also the default for the `latest` tag and version tags that are not further specified.
+The `apache` tag contains a full Friendica installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
 
-The second option is a `fpm` container.
-It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Friendica server.
-To use this image it must be combined with any Webserver that can proxy the http requests to the FastCGI-port of the container.
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Friendica server. To use this image it must be combined with any Webserver that can proxy the http requests to the FastCGI-port of the container.
 
 ## Using the apache image
+
 You need at least one other mariadb/mysql-container to link it to Friendica.
 
-The apache image contains a webserver and exposes port 80.
-To start the container type:
+The apache image contains a webserver and exposes port 80. To start the container type:
+
 ```console
 $ docker run -d -p 8080:80 --link some-mysql:mysql friendica
 ```
@@ -34,124 +23,125 @@ $ docker run -d -p 8080:80 --link some-mysql:mysql friendica
 Now you can access the Friendica installation wizard at http://localhost:8080/ from your host system.
 
 ## Using the fpm image
-To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container.
-For fpm connection this container exposes port 9000.
-In most cases you might want use another container or your host as proxy.
-If you use your host you can address your Friendica container directly on port 9000.
-If you use another container, make sure that you add them to the same docker network (via `docker run --network <NAME> ...` or a `docker-compose` file).
-In both cases you don't want to map the fpm port to you host. 
+
+To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases you might want use another container or your host as proxy. If you use your host you can address your Friendica container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network <NAME> ...` or a `docker-compose` file). In both cases you don't want to map the fpm port to you host.
 
 ```console
 $ docker run -d friendica:fpm
 ```
 
-As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files.
-This can be achieved with the `volumes-from` option.
-You can find more information in the docker-compose section.
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the docker-compose section.
 
 ## Using the cron job
 
 There are three options to enable the cron-job for Friendica:
-- Using the default Image and activate the cron-job (see [Installation](https://friendi.ca/resources/installation/), sector `Activating scheduled tasks`)
-- Using the default image (apache, fpm, fpm-alpine) and creating **two** container (one for cron and one for the main app)
-- Using one of the additional, prepared [`cron dockerfiles`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/cron)
+
+-	Using the default Image and activate the cron-job (see [Installation](https://friendi.ca/resources/installation/), sector `Activating scheduled tasks`)
+-	Using the default image (apache, fpm, fpm-alpine) and creating **two** container (one for cron and one for the main app)
+-	Using one of the additional, prepared [`cron dockerfiles`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/cron)
 
 ## Using sendmail for E-Mail support
 
-You have to set the `--hostname/-h` parameter correctly to make the `mail()` command use the right domainname of it's e-mail.
-Currently, the command `sendmail` will be used for the `mail()` support of Friendica.
+You have to set the `--hostname/-h` parameter correctly to make the `mail()` command use the right domainname of it's e-mail. Currently, the command `sendmail` will be used for the `mail()` support of Friendica.
 
-Be aware that in production environment, you normally have an external MTA (or a SmartHost) for correctly signing and routing your e-mails.
-See the Dockerfiles at [`smtp`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/smtp) for examples how to configure it.
+Be aware that in production environment, you normally have an external MTA (or a SmartHost) for correctly signing and routing your e-mails. See the Dockerfiles at [`smtp`](https://github.com/friendica/docker/tree/master/.examples/dockerfiles/smtp) for examples how to configure it.
 
 ### `apache` and `fpm` image
+
 `sendmail` is used as a SMTP MTA for standalone usage and it works out-of-the-box.
 
 ### `fpm-alpine` image
-For alpine, there is no "standalone" mail-service available.
-Therefore you **have** to setup a SMTP MTA.
+
+For alpine, there is no "standalone" mail-service available. Therefore you **have** to setup a SMTP MTA.
 
 ## Using an external database
-By default the `latest` container uses a local MySQL-Database for data storage, but the Friendica setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB database.
-You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup.
+
+By default the `latest` container uses a local MySQL-Database for data storage, but the Friendica setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup.
 
 ## Persistent data
-The Friendica installation and all data beyond what lives in the database (file uploads, etc) is stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`.
-The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`.
-That means your data is saved even if the container crashes, is stopped or deleted.
 
-To make your data persistent to upgrading and get access for backups is using named docker volume or mount a host folder.
-To achieve this you need one volume for your database container and Friendica.
+The Friendica installation and all data beyond what lives in the database (file uploads, etc) is stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+To make your data persistent to upgrading and get access for backups is using named docker volume or mount a host folder. To achieve this you need one volume for your database container and Friendica.
 
 Friendica:
-- `/var/www/html/` folder where all Friendica data lives
+
+-	`/var/www/html/` folder where all Friendica data lives
+
 ```console
 $ docker run -d \
--v friendica-vol-1:/var/www/html \
-friendica
+  -v friendica-vol-1:/var/www/html \
+  friendica
 ```
 
 Database:
-- `/var/lib/mysql` MySQL / MariaDB Data
+
+-	`/var/lib/mysql` MySQL / MariaDB Data
+
 ```console
 $ docker run -d \
--v mysql-vol-1:/var/lib/mysql \
-mariadb
+  -v mysql-vol-1:/var/lib/mysql \
+  mariadb
 ```
 
 ## Auto configuration via environment variables
-The Friendica image supports auto configuration via environment variables.
-You can preconfigure everything that is asked on the install page on first run. 
 
-- `AUTOINSTALL` if `true`, the automatic configuration will start (Default: `false`)
+The Friendica image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run.
+
+-	`AUTOINSTALL` if `true`, the automatic configuration will start (Default: `false`)
 
-__MYSQL/MariaDB__:
-- `MYSQL_USERNAME` Username for the database user using mysql / mariadb.
-- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
-- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
-- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
-- `MYSQL_PORT` Port of the database server using mysql / mariadb.
+**MYSQL/MariaDB**:
+
+-	`MYSQL_USERNAME` Username for the database user using mysql / mariadb.
+-	`MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+-	`MYSQL_DATABASE` Name of the database using mysql / mariadb.
+-	`MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+-	`MYSQL_PORT` Port of the database server using mysql / mariadb.
 
 You can also predefine the following `.htconfig.php` values:
-- `MAILNAME` E-Mail address of the administrator
-- `TZ` The default localization of the Friendica server
-- `LANGUAGE` The default language of the Friendica server
-- `SITENAME` The default name of the Friendica server
+
+-	`MAILNAME` E-Mail address of the administrator
+-	`TZ` The default localization of the Friendica server
+-	`LANGUAGE` The default language of the Friendica server
+-	`SITENAME` The default name of the Friendica server
 
 ## Updating Friendica
 
 There are differences between the [stable](https://github.com/friendica/docker/tree/master/stable/) and the [develop](https://github.com/friendica/docker/tree/master/develop/) branches.
 
-They have both in common that normally we do not automatically overwrite your working directory with the new version.
-Instead you need to explicit run `friendica update` for the node for updating files&database.
+They have both in common that normally we do not automatically overwrite your working directory with the new version. Instead you need to explicit run `friendica update` for the node for updating files&database.
+
+## Updating stable
 
-## Updating stable 
 You have to pull the latest image from the hub (`docker pull friendica`).
 
 ## Updating develop
-You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/).
-Instead you can just update your node with executing `friendica update` on the node.
-Example:
+
+You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/). Instead you can just update your node with executing `friendica update` on the node. Example:
+
 ```console
 $ docker exec -ti friendica_running_node friendica update
 ```
+
 It will clone the latest Friendica version and copy it to your working directory.
 
 # The `friendica` CLI
 
-To make the usage of the Docker images smooth, we created a little CLI.
-It wraps the common commands for Friendica and adds new commands.
+To make the usage of the Docker images smooth, we created a little CLI. It wraps the common commands for Friendica and adds new commands.
 
 You can call it with
+
 ```console
 $ docker exec -ti friendica_running_node friendica <command>
 ```
 
 Commands:
-- `console` Executes an command in the Friendica console (`bin/console.php` wrapper)
-- `composer` Executes the composer.phar executable for Friendica (`bin/composer.phar` wrapper)
-- `install` Installs Friendica on a empty environment (gets called automatically during first start) 
-- `update` Updates Friendica on a **existing** environment
+
+-	`console` Executes an command in the Friendica console (`bin/console.php` wrapper)
+-	`composer` Executes the composer.phar executable for Friendica (`bin/composer.phar` wrapper)
+-	`install` Installs Friendica on a empty environment (gets called automatically during first start)
+-	`update` Updates Friendica on a **existing** environment
 
 # Questions / Issues
-If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/friendica/docker) and write an issue. 
\ No newline at end of file
+
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/friendica/docker) and write an issue.