Merge pull request #4 from nupplaphil/friendica_server

Temporary change image name

.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM friendica:apache
+FROM friendica/server: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)

.examples/dockerfiles/cron/apache/Dockerfile

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

.examples/dockerfiles/cron/fpm/Dockerfile

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

.examples/dockerfiles/smtp/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM friendica:apache
+FROM friendica/server: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)

.examples/dockerfiles/smtp/fpm-alpine/Dockerfile

@@ -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)
 ENV SMTP_HOST mail

.examples/dockerfiles/smtp/fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM friendica:develop-fpm
+FROM friendica/server: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)

.travis.yml

@@ -15,7 +15,7 @@ install:
 before_script:
   - env | sort
   - cd "$VARIANT"
-  - slash='/'; image="friendica:${VARIANT//$slash/-}"
+  - slash='/'; image="friendica/server:${VARIANT//$slash/-}"
 
 script:
   - docker build -t "$image" .

README.md

@@ -46,7 +46,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.
 
 ```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.
@@ -99,7 +99,7 @@ Friendica:
 ```console
 $ docker run -d \
   -v friendica-vol-1:/var/www/html \
-  friendica
+  friendica/server
 ```
 
 Database:
@@ -209,7 +209,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica
+    image: friendica/server
     restart: always
     volumes:
       - friendica:/var/www/html
@@ -264,7 +264,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica:fpm
+    image: friendica/server:fpm
     restart: always
     volumes:
       - friendica:/var/www/html    

pwd.yml

@@ -13,7 +13,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica
+    image: friendica/server
     restart: always
     ports:
       - 8080:80
@@ -31,7 +31,7 @@ services:
       - db
 
   cron:
-    image: friendica
+    image: friendica/server
     restart: always
     volumes:
       - friendica:/var/www/html