Skip to content

Commit

Permalink
Etherpad 1.6.6 upgrade and README updates
Browse files Browse the repository at this point in the history
  • Loading branch information
northway committed May 30, 2018
1 parent 5fb7d45 commit 84813f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:9
MAINTAINER Tony Motakis <[email protected]>

ENV ETHERPAD_VERSION 1.6.5
ENV ETHERPAD_VERSION 1.6.6
ENV NODE_ENV production

RUN apt-get update && \
Expand Down
16 changes: 4 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 84813f2

Please sign in to comment.