2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-01-04 04:38:21 +01:00

Temporary use of image "friendica/server" instead of "friendica"

Until https://github.com/docker-library/official-images/pull/4375 is merged.
This commit is contained in:
Philipp Holzer 2018-05-22 19:51:41 +02:00
parent 6f5687f53b
commit e92023d702
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
7 changed files with 10 additions and 10 deletions

View file

@ -1,4 +1,4 @@
FROM friendica:apache FROM friendica/server:apache
# simple = using an smtp without any credentials (mostly in local networks) # 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) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support)

View file

@ -1,4 +1,4 @@
FROM friendica:apache FROM friendica/server:apache
ENV AUTOINSTALL true ENV AUTOINSTALL true
ENV MARIADB_VERSION 10.3 ENV MARIADB_VERSION 10.3

View file

@ -1,4 +1,4 @@
FROM friendica:fpm FROM friendica/server:fpm
ENV AUTOINSTALL true ENV AUTOINSTALL true
ENV MARIADB_VERSION 10.3 ENV MARIADB_VERSION 10.3

View file

@ -1,4 +1,4 @@
FROM friendica:apache FROM friendica/server:apache
# simple = using an smtp without any credentials (mostly in local networks) # 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) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support)

View file

@ -1,4 +1,4 @@
FROM friendica:develop-fpm-alpine FROM friendica/server:fpm-alpine
# at least you HAVE to set one SMTP_HOST (normally something like mail.example.org) # at least you HAVE to set one SMTP_HOST (normally something like mail.example.org)
ENV SMTP_HOST mail ENV SMTP_HOST mail

View file

@ -1,4 +1,4 @@
FROM friendica:develop-fpm FROM friendica/server:fpm
# simple = using an smtp without any credentials (mostly in local networks) # 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) # custom = you need to set host, port, auth_options, authinfo (e.g. for GMX support)

View file

@ -28,7 +28,7 @@ You need at least one other mariadb/mysql-container to link it to Friendica.
The apache image contains a webserver and exposes port 80. The apache image contains a webserver and exposes port 80.
To start the container type: To start the container type:
```console ```console
$ docker run -d -p 8080:80 --link some-mysql:mysql friendica $ docker run -d -p 8080:80 --link some-mysql:mysql friendica/server
``` ```
Now you can access the Friendica installation wizard at http://localhost:8080/ from your host system. Now you can access the Friendica installation wizard at http://localhost:8080/ from your host system.
@ -42,7 +42,7 @@ If you use another container, make sure that you add them to the same docker net
In both cases you don't want to map the fpm port to you host. In both cases you don't want to map the fpm port to you host.
```console ```console
$ docker run -d friendica:fpm $ docker run -d friendica/server:fpm
``` ```
As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files. As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files.
@ -88,7 +88,7 @@ Friendica:
```console ```console
$ docker run -d \ $ docker run -d \
-v friendica-vol-1:/var/www/html \ -v friendica-vol-1:/var/www/html \
friendica friendica/server
``` ```
Database: Database:
@ -126,7 +126,7 @@ They have both in common that normally we do not automatically overwrite your wo
Instead you need to explicit run `update` for the node for updating files&database. Instead you need to explicit run `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`). You have to pull the latest image from the hub (`docker pull friendica/server`).
## Updating develop ## Updating develop
You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/). You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/).