From 84813f20d4898363fdd8c8f6f977ca94798bec54 Mon Sep 17 00:00:00 2001 From: northway Date: Wed, 30 May 2018 10:17:30 +0200 Subject: [PATCH] Etherpad 1.6.6 upgrade and README updates --- Dockerfile | 2 +- README.md | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d070cf..9833b47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:9 MAINTAINER Tony Motakis -ENV ETHERPAD_VERSION 1.6.5 +ENV ETHERPAD_VERSION 1.6.6 ENV NODE_ENV production RUN apt-get update && \ diff --git a/README.md b/README.md index e616342..85b89d1 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,8 @@ # Etherpad Lite image for docker -This is a docker image for [Etherpad Lite](http://etherpad.org/) collaborative -text editor. The Dockerfile for this image has been inspired by the -[official Wordpress](https://registry.hub.docker.com/_/wordpress/) Dockerfile and -[johbo's etherpad-lite](https://registry.hub.docker.com/u/johbo/etherpad-lite/) -image. +This is a docker image for [Etherpad Lite](http://etherpad.org/) collaborative text editor. The Dockerfile for this image has been inspired by the [official Wordpress](https://registry.hub.docker.com/_/wordpress/) Dockerfile, [johbo's etherpad-lite](https://registry.hub.docker.com/u/johbo/etherpad-lite/) image and [tvelocity's etherpad-lite](https://github.com/tvelocity/dockerfiles) image. -This image uses a database (mysql or postgres) container for the backend for -the pads. It is based on debian jessie instead of the official node docker -image, since the latest stable version of etherpad-lite does not support npm 2. +This image uses a database (mysql or postgres) container for the backend for the pads. It is based on debian jessie instead of the official node docker image, since the latest stable version of etherpad-lite does not support npm 2. ## About Etherpad Lite @@ -39,12 +33,10 @@ $ docker run -d \ -e ETHERPAD_DB_HOST=ep_mysql \ -e ETHERPAD_DB_PASSWORD=password \ -p 9001:9001 \ - tvelocity/etherpad-lite + kifu/etherpad ``` -Etherpad will automatically create an `etherpad` database in the specified mysql -server if it does not already exist. -You can now access Etherpad Lite from http://localhost:9001/ +Etherpad will automatically create an `etherpad` database in the specified mysql server if it does not already exist. You can now access Etherpad Lite from http://localhost:9001/ ## Environment variables