From e92023d702900bd3ea8d021f90a4bb7369ac52f7 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 22 May 2018 19:51:41 +0200 Subject: [PATCH 1/2] Temporary use of image "friendica/server" instead of "friendica" Until https://github.com/docker-library/official-images/pull/4375 is merged. --- .../mariadb-cron-smtp/apache/app/Dockerfile | 2 +- .examples/dockerfiles/cron/apache/Dockerfile | 2 +- .examples/dockerfiles/cron/fpm/Dockerfile | 2 +- .examples/dockerfiles/smtp/apache/Dockerfile | 2 +- .examples/dockerfiles/smtp/fpm-alpine/Dockerfile | 2 +- .examples/dockerfiles/smtp/fpm/Dockerfile | 2 +- README.md | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile index eb6c0f2..015f3c9 100644 --- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/app/Dockerfile +++ b/.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) diff --git a/.examples/dockerfiles/cron/apache/Dockerfile b/.examples/dockerfiles/cron/apache/Dockerfile index 5875232..bf73178 100644 --- a/.examples/dockerfiles/cron/apache/Dockerfile +++ b/.examples/dockerfiles/cron/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM friendica:apache +FROM friendica/server:apache ENV AUTOINSTALL true ENV MARIADB_VERSION 10.3 diff --git a/.examples/dockerfiles/cron/fpm/Dockerfile b/.examples/dockerfiles/cron/fpm/Dockerfile index 34f42cf..86502ed 100644 --- a/.examples/dockerfiles/cron/fpm/Dockerfile +++ b/.examples/dockerfiles/cron/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM friendica:fpm +FROM friendica/server:fpm ENV AUTOINSTALL true ENV MARIADB_VERSION 10.3 diff --git a/.examples/dockerfiles/smtp/apache/Dockerfile b/.examples/dockerfiles/smtp/apache/Dockerfile index fd442d1..7b3bc95 100644 --- a/.examples/dockerfiles/smtp/apache/Dockerfile +++ b/.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) diff --git a/.examples/dockerfiles/smtp/fpm-alpine/Dockerfile b/.examples/dockerfiles/smtp/fpm-alpine/Dockerfile index d226c8b..d8d8693 100644 --- a/.examples/dockerfiles/smtp/fpm-alpine/Dockerfile +++ b/.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 diff --git a/.examples/dockerfiles/smtp/fpm/Dockerfile b/.examples/dockerfiles/smtp/fpm/Dockerfile index 99a6f24..af75d5c 100644 --- a/.examples/dockerfiles/smtp/fpm/Dockerfile +++ b/.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) diff --git a/README.md b/README.md index 9102c1a..5d6c1c7 100644 --- a/README.md +++ b/README.md @@ -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. To start the container type: ```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. @@ -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. ```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. @@ -88,7 +88,7 @@ Friendica: ```console $ docker run -d \ -v friendica-vol-1:/var/www/html \ -friendica +friendica/server ``` 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. ## 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 You don't need to pull the image for each commit in [friendica](https://github.com/friendica/friendica/). From ca12be111e4900f005d827cd3b917f2e7a714b79 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 22 May 2018 20:15:36 +0200 Subject: [PATCH 2/2] add `friendica/server` to README.md , travis & pwd --- .travis.yml | 2 +- README.md | 8 ++++---- pwd.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0694495..7098d72 100644 --- a/.travis.yml +++ b/.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" . diff --git a/README.md b/README.md index c45d949..115f901 100644 --- a/README.md +++ b/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 diff --git a/pwd.yml b/pwd.yml index 825f89c..9bc2032 100644 --- a/pwd.yml +++ b/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