From 948d4fbba2d6f2fd5f7cc8e1b5c3115831745905 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Oct 2017 17:31:47 +0000 Subject: [PATCH] Run update.sh --- arangodb/README.md | 12 +++++++++++- influxdb/README.md | 8 ++++---- telegraf/README.md | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arangodb/README.md b/arangodb/README.md index e8b8d49e4..05ba860c7 100644 --- a/arangodb/README.md +++ b/arangodb/README.md @@ -67,7 +67,7 @@ The supported data models can be mixed in queries and allow ArangoDB to be the a Joins and Transactions are key features for flexible, secure data designs, widely used in RDBMSs that you won't want to miss in NoSQL products. You decide how and when to use Joins and strong consistency guarantees, keeping all the power for scaling and performance as choice. -Furthermore, ArangoDB offers a microservice framework called [Foxx](https://www.arangodb.com/foxx) to build your own Rest API with a few lines of code. +Furthermore, ArangoDB offers a microservice framework called [Foxx](https://www.arangodb.com/why-arangodb/foxx) to build your own Rest API with a few lines of code. #### ArangoDB Documentation @@ -139,6 +139,8 @@ The ArangoDB image provides several authentication methods which can be specifie Specify your own root password. +Note: this way of specifying logins only applies to single server installations. With clusters you have to provision the users via the root user with empty password once the system is up. + ### Command line options In order to get a list of supported options, run @@ -149,6 +151,8 @@ unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 arangodb arangod --help ## Persistent Data +ArangoDB supports two different storage engines as of ArangoDB 3.2. You can choose them while instantiating the container with the environment variable `ARANGO_STORAGE_ENGINE`. With `mmfiles` you choose the classic storage engine, `rocksdb` will choose the newly introduced storage engine based on [rocksdb](http://rocksdb.org/). The default choice is `mmfiles`. + ArangoDB use the volume `/var/lib/arangodb3` as database directory to store the collection data and the volume `/var/lib/arangodb3-apps` as apps directory to store any extensions. These directories are marked as docker volumes. Please note that the old version 2.x used `/var/lib/arangodb` and `/var/lib/arangodb-apps`. We will refer to the 3.x variant in this document. In case you are starting a 2.x image just replace it with the 2.x variant. @@ -194,6 +198,12 @@ unix> docker run -d --name arangodb-persist -v /var/lib/arangodb3 busybox true If you are using the image as a base image please make sure to wrap any CMD in the [exec](https://docs.docker.com/engine/reference/builder/#cmd) form. Otherwise the default entrypoint will not do its bootstrapping work. +When deriving the image, you can control the instantiation via putting files into `/docker-entrypoint-initdb.d/`. + +- `*.sh` - files ending with .sh will be run as a bash shellscript. +- `*.js` - files will be executed with arangosh. You can specify additional arangosh arguments via the `ARANGOSH_ARGS` environment variable. +- `dumps/` - in this directory you can place subdirectories containing database dumps generated using [arangodump](https://docs.arangodb.com/latest/Manual/Administration/Arangodump.html). They will be restored using [arangorestore](https://docs.arangodb.com/latest/Manual/Administration/Arangorestore.html). + # License [Arangodb itself is licensed under the Apache License](https://github.com/arangodb/arangodb/blob/devel/LICENSE), but it contains [software of third parties under their respective licenses](https://github.com/arangodb/arangodb/blob/devel/LICENSES-OTHER-COMPONENTS.md). diff --git a/influxdb/README.md b/influxdb/README.md index 01aa087a1..29e692429 100644 --- a/influxdb/README.md +++ b/influxdb/README.md @@ -16,10 +16,10 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.2`, `1.2.4` (*influxdb/1.2/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/dc4f0480be886393041acf1c3f739f197d45b9c3/influxdb/1.2/Dockerfile) -- [`1.2-alpine`, `1.2.4-alpine` (*influxdb/1.2/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/dc4f0480be886393041acf1c3f739f197d45b9c3/influxdb/1.2/alpine/Dockerfile) -- [`1.3`, `1.3.6`, `latest` (*influxdb/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/007a07b94e87bfc66d62a937cd2a6073f92f81dc/influxdb/1.3/Dockerfile) -- [`1.3-alpine`, `1.3.6-alpine`, `alpine` (*influxdb/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/007a07b94e87bfc66d62a937cd2a6073f92f81dc/influxdb/1.3/alpine/Dockerfile) +- [`1.2`, `1.2.4` (*influxdb/1.2/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a572255a4fb9fa2ec8e37b5a35440403b1f7f1b5/influxdb/1.2/Dockerfile) +- [`1.2-alpine`, `1.2.4-alpine` (*influxdb/1.2/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a572255a4fb9fa2ec8e37b5a35440403b1f7f1b5/influxdb/1.2/alpine/Dockerfile) +- [`1.3`, `1.3.6`, `latest` (*influxdb/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a572255a4fb9fa2ec8e37b5a35440403b1f7f1b5/influxdb/1.3/Dockerfile) +- [`1.3-alpine`, `1.3.6-alpine`, `alpine` (*influxdb/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a572255a4fb9fa2ec8e37b5a35440403b1f7f1b5/influxdb/1.3/alpine/Dockerfile) # Quick reference diff --git a/telegraf/README.md b/telegraf/README.md index e8af7bc8a..d30b41613 100644 --- a/telegraf/README.md +++ b/telegraf/README.md @@ -18,8 +18,8 @@ WARNING: - [`1.3`, `1.3.5` (*telegraf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.3/Dockerfile) - [`1.3-alpine`, `1.3.5-alpine` (*telegraf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/e7112839e28c53da8bfefb9f96a46cb92df58cf2/telegraf/1.3/alpine/Dockerfile) -- [`1.4`, `1.4.1`, `latest` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/143e1a5f30db7928eded3089e2662a577ad5317b/telegraf/1.4/Dockerfile) -- [`1.4-alpine`, `1.4.1-alpine`, `alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/143e1a5f30db7928eded3089e2662a577ad5317b/telegraf/1.4/alpine/Dockerfile) +- [`1.4`, `1.4.2`, `latest` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/b34f003d2236345d8256c43c01c6fe3cc8134b40/telegraf/1.4/Dockerfile) +- [`1.4-alpine`, `1.4.2-alpine`, `alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/b34f003d2236345d8256c43c01c6fe3cc8134b40/telegraf/1.4/alpine/Dockerfile) # Quick reference