summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-06 23:04:11 +0100
committerstartxfr <clarue@startx.fr>2015-12-06 23:04:11 +0100
commit3e4f13d3b46b87f9892ab936bd537036d20bce02 (patch)
tree87439f8048e8f7215b46fa240a54d2fa4c34876f
parentfb1274af7b8dd8781e15f3eb464a213ba41e84b0 (diff)
downloadphpmyadmin-3e4f13d3b46b87f9892ab936bd537036d20bce02.tar.gz
phpmyadmin-3e4f13d3b46b87f9892ab936bd537036d20bce02.tar.bz2
phpmyadmin-3e4f13d3b46b87f9892ab936bd537036d20bce02.tar.xz
phpmyadmin-3e4f13d3b46b87f9892ab936bd537036d20bce02.zip
update doc for couchbase
-rw-r--r--Services/README.md22
-rw-r--r--Services/couchbase/README.md6
2 files changed, 14 insertions, 14 deletions
diff --git a/Services/README.md b/Services/README.md
index 4c0140a..ab66e3f 100644
--- a/Services/README.md
+++ b/Services/README.md
@@ -19,17 +19,17 @@ your project and start using stable or experimental services in your application
## Available services
-| Service | Docker Hub repository | Fedora flavours | CentOS flavours | Doc |
-|---------------|---------------------------------------------------------------------|-----------------------------------|-----------------|---------------------------------------------------|
-| Apache | [`startx/sv-apache`](https://hub.docker.com/r/startx/sv-apache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](apache/README.md) |
-| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mariadb/README.md) |
-| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](memcache/README.md) |
-| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mongo/README.md) |
-| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](nodejs/README.md) |
-| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](ooconv/README.md) |
-| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](php/README.md) |
-| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](postgres/README.md) |
-
+| Service | Docker Hub repository | Fedora flavours | CentOS flavours | Doc
+|---------------|----------------------------------------------------------------------|-----------------------------------|-----------------|--------------------------------
+| Apache | [`startx/sv-apache`](https://hub.docker.com/r/startx/sv-apache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](apache/README.md)
+| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mariadb/README.md)
+| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](memcache/README.md)
+| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mongo/README.md)
+| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](nodejs/README.md)
+| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](ooconv/README.md)
+| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](php/README.md)
+| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](postgres/README.md)
+| Couchbase | [`startx/sv-couchbase`](https://hub.docker.com/r/startx/sv-couchbase)| | `:latest` `:7` | [manual](couchbase/README.md)
## Running from dockerhub registry
diff --git a/Services/couchbase/README.md b/Services/couchbase/README.md
index 979a246..dce4fb7 100644
--- a/Services/couchbase/README.md
+++ b/Services/couchbase/README.md
@@ -9,9 +9,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + couchbase 1.4.17
-* `:fc23` : Fedora core 23 + couchbase 1.4.17
-* `:centos7` : CentOS 7 + couchbase
+* `:latest` : Centos 7 + Couchbase Server 4.1.0
+* `:centos7` : Centos 7 + Couchbase Server 4.1.0
## Running from dockerhub registry
@@ -27,6 +26,7 @@ service:
CONTAINER_INSTANCE: "service-couchbase"
volumes:
- "/tmp/container/logs/couchbase:/data/logs/couchbase"
+ - "/tmp/container/couchbase:/data/couchbase"
```
## Docker-compose in various situations