influxdb: Add documentation for the 2.x line. (#1871)

influxdb/content.md

@@ -6,19 +6,63 @@ InfluxDB is a time series database built from the ground up to handle high write
 
 %%LOGO%%
 
-## Updating latest to 2.0
+## `latest` updated to InfluxDB 2.x
 
-In the future, the latest tag for this image will point to the latest released implementation of influxdb 2.0. This will happen when the first general available release for 2.0 exists. If you are using the `latest` tag for any production or development purposes, please update your development environment to reference the `1.8` tag.
+The `latest` tag for this image now points to the latest released implementation of InfluxDB 2.x. If you are using the `latest` tag and would like to stay on the InfluxDB 1.x line, please update your environment to reference the `1.8` tag.
 
-## Using this Image
+## Upgrading from quay.io-hosted InfluxDB 2.x image
+
+Early Docker builds of InfluxDB 2.x were hosted at `quay.io/influxdb/influxdb`. The builds were very bare-bones, containing the `influx` and `influxd` binaries without any default configuration or helper scripts. By default, the `influxd` process stored data under `/root/.influxdbv2`.
+
+Starting with `v2.0.4`, we've restored our DockerHub build. This build defaults to storing data in `/var/lib/influxdb2`. Upgrading directly from `quay.io/influxdb/influxdb` to `influxdb:2.0.4` without modifying any settings will appear to cause data loss, as the new process won't be able to find your existing data files.
+
+To avoid this problem when migrating from `quay.io/influxdb/influxdb` to `influxdb:2.0`, you can use one of the following approaches.
+
+### Change volume mount point
+
+If you don't mind using the new default path, you can switch the mount-point for the volume containing your data:
+
+```console
+# Migrate from this:
+$ docker run -p 8086:8086 \
+      -v $PWD:/root/.influxdbv2 \
+      quay.io/influxdb/influxdb:v2.0.3
+
+# To this:
+docker run -p 8086:8086 \
+      -v $PWD:/var/lib/influxdb2 \
+      %%IMAGE%%
+```
+
+### Override default configs
+
+If you'd rather keep your data files in the home directory, you can override the container's default config:
+
+```console
+# Migrate from this:
+$ docker run -p 8086:8086 \
+      -v $PWD:/root/.influxdbv2 \
+      quay.io/influxdb/influxdb:v2.0.3
+
+# To this:
+docker run -p 8086:8086 \
+      -e INFLUXD_BOLT_PATH=/root/.influxdbv2/influxd.bolt \
+      -e INFLUXD_ENGINE_PATH=/root/.influxdbv2/engine \
+      -v $PWD:/root/.influxdbv2 \
+      %%IMAGE%%
+```
+
+See the section about configuration below for more ways to override the data paths.
+
+## Using this Image - InfluxDB 2.x
 
 ### Running the container
 
-The InfluxDB image exposes a shared volume under `/var/lib/influxdb`, so you can mount a host directory to that point to access persisted container data. A typical invocation of the container might be:
+The InfluxDB image exposes a shared volume under `/var/lib/influxdb2`. You can mount a host directory to that point to access persisted container data. A typical invocation of the container might be:
 
 ```console
 $ docker run -p 8086:8086 \
-      -v $PWD:/var/lib/influxdb \
+      -v $PWD:/var/lib/influxdb2 \
       %%IMAGE%%
 ```
 
@@ -26,12 +70,375 @@ Modify `$PWD` to the directory where you want to store data associated with the
 
 You can also have Docker control the volume mountpoint by using a named volume.
 
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb2:/var/lib/influxdb2 \
+      %%IMAGE%%
+```
+
+### Exposed Ports
+
+The following ports are important and are used by InfluxDB.
+
+-	8086 HTTP UI and API port
+
+The HTTP port will be automatically exposed when using `docker run -P`.
+
+Find more about API Endpoints & Ports [here](https://docs.influxdata.com/influxdb/v2.0/reference/api/).
+
+### Configuration
+
+InfluxDB can be configured using a mix of a config file, environment variables, and CLI options. To mount a configuration file and use it with the server, you can use this command to generate the default configuration file:
+
+```console
+$ docker run --rm %%IMAGE%% influxd print-config > config.yml
+```
+
+Modify the default configuration, which will now be available under `$PWD`. Then start the InfluxDB container:
+
+```console
+$ docker run -p 8086:8086 \
+      -v $PWD/config.yml:/etc/influxdb2/config.yml:ro \
+      %%IMAGE%%
+```
+
+Modify `$PWD` to be the directory where you want to store the configuration file.
+
+Individual config settings can be overridden by environment variables. The variables must be named using the format `INFLUXD_${SNAKE_CASE_NAME}`. The `SNAKE_CASE_NAME` for an option will be the option's name with all dashes (`-`) replaced by underscores (`_`), in all caps.
+
+Examples:
+
+```console
+# Config setting: bolt-path
+INFLUXD_BOLT_PATH=/root/influxdb.bolt
+# Config setting: no-tasks
+INFLUXD_NO_TASKS=true
+# Config setting: storage-wal-fsync-delay
+INFLUXD_STORAGE_WAL_FSYNC_DELAY=15m
+```
+
+Finally, all config options can be passed as CLI options:
+
+```console
+$ docker run -p 8086:8086 \
+      %%IMAGE%% --storage-wal-fsync-delay=15m
+```
+
+CLI options take precedence over environment variables.
+
+Find more about configuring InfluxDB [here](https://docs.influxdata.com/influxdb/v2.0/reference/config-options/).
+
+### Database Setup
+
+InfluxDB 2.x requires authentication. A special API exists to bootstrap the first super-user in the database, along with an initial organization and bucket. It's possible to access this API manually, or to run it automatically via environment variables.
+
+#### Manual Setup
+
+If your InfluxDB container is running locally (or on a host exposed to the network), you can perform initial setup from outside the container using either the UI or the `influx` CLI. Find more about setting up InfluxDB using these methods [here](https://docs.influxdata.com/influxdb/v2.0/get-started/#set-up-influxdb).
+
+It's also possible to perform manual setup from within the container using `docker exec`. For example, if you start the container:
+
+```console
+$ docker run -d -p 8086:8086 \
+      --name influxdb2 \
+      -v $PWD:/var/lib/influxdb2 \
+      %%IMAGE%%
+```
+
+You can then run the `influx` client in the container:
+
+```console
+$ docker exec influxdb2 influx setup \
+      --username $USERNAME \
+      --password $PASSWORD \
+      --org $ORGANIZATION \
+      --bucket $BUCKET
+```
+
+Running setup from within the container will cause CLI configs to be written to `/etc/influxdb2/influx-configs`. You can then use the `influx` CLI from within the container to extract the generated admin token:
+
+```console
+# Using table output + cut
+$ docker exec influxdb2 influx auth list \
+      --user $USERNAME \
+      --hide-headers | cut -f 3
+
+# Using JSON output + jq
+$ docker exec influxdb2 influx auth list \
+      --user $USERNAME \
+      --json | jq -r '.[].token'
+```
+
+Alternatively, you could configure your initial InfluxDB run to mount `/etc/influxdb2` as a volume:
+
+```console
+$ docker run -d -p 8086:8086 \
+      --name influxdb2 \
+      -v $PWD/data:/var/lib/influxdb2 \
+      -v $PWD/config:/etc/influxdb2 \
+      %%IMAGE%%
+```
+
+This will make the generated CLI configs available to the host.
+
+#### Automated Setup
+
+The InfluxDB image contains some extra functionality to automatically bootstrap the system. This functionality is enabled by setting the `DOCKER_INFLUXDB_INIT_MODE` environment variable to the value `setup` when running the container. Additional environment variables are used to configure the setup logic:
+
+-	`DOCKER_INFLUXDB_INIT_USERNAME`: The username to set for the system's initial super-user (**Required**).
+-	`DOCKER_INFLUXDB_INIT_PASSWORD`: The password to set for the system's inital super-user (**Required**).
+-	`DOCKER_INFLUXDB_INIT_ORG`: The name to set for the system's initial organization (**Required**).
+-	`DOCKER_INFLUXDB_INIT_BUCKET`: The name to set for the system's initial bucket (**Required**).
+-	`DOCKER_INFLUXDB_INIT_RETENTION`: The duration the system's initial bucket should retain data. If not set, the initial bucket will retain data forever.
+-	`DOCKER_INFLUXDB_INIT_ADMIN_TOKEN`: The authentication token to associate with the system's initial super-user. If not set, a token will be auto-generated by the system.
+
+Automated setup will generate metadata files and CLI configurations. It's recommended to mount volumes at both paths to avoid losing data.
+
+For example, a minimal invocation of automated setup is:
+
+```console
+$ docker run -d -p 8086:8086 \
+      -v $PWD/data:/var/lib/influxdb2 \
+      -v $PWD/config:/etc/influxdb2 \
+      -e DOCKER_INFLUXDB_INIT_MODE=setup \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      %%IMAGE%%
+```
+
+And an example using all available options is:
+
+```console
+$ docker run -d -p 8086:8086 \
+      -v $PWD/data:/var/lib/influxdb2 \
+      -v $PWD/config:/etc/influxdb2 \
+      -e DOCKER_INFLUXDB_INIT_MODE=setup \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      -e DOCKER_INFLUXDB_INIT_RETENTION=1w \
+      -e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token \
+      %%IMAGE%%
+```
+
+**NOTE:** Automated setup will not run if an existing boltdb file is found at the configured path. This behavior allows for the InfluxDB container to reboot post-setup without encountering "DB is already set up" errors.
+
+### Interacting with InfluxDB
+
+Once an InfluxDB instance has completed initial setup, its APIs will unlock. See the main documentation site for reference information and examples on:
+
+-	[Writing data](https://docs.influxdata.com/influxdb/v2.0/write-data/)
+-	[Reading data](https://docs.influxdata.com/influxdb/v2.0/query-data/)
+-	[Configuring security](https://docs.influxdata.com/influxdb/v2.0/security/)
+-	[And more!](https://docs.influxdata.com/influxdb/v2.0/)
+
+### Upgrading from InfluxDB 1.x
+
+InfluxDB 2.x provides a 1.x-compatible API, but expects a different storage layout on disk. To bridge this mismatch, the InfluxDB image contains extra functionality to migrate 1.x data and config into 2.x layouts automatically before booting the `influxd` server.
+
+The automated upgrade process also bootstraps an initial admin user, organization, and bucket in the system, so it uses the same set of environment variables as the automated setup process described above:
+
+-	`DOCKER_INFLUXDB_INIT_USERNAME`: The username to set for the system's initial super-user (**Required**).
+-	`DOCKER_INFLUXDB_INIT_PASSWORD`: The password to set for the system's inital super-user (**Required**).
+-	`DOCKER_INFLUXDB_INIT_ORG`: The name to set for the system's initial organization (**Required**).
+-	`DOCKER_INFLUXDB_INIT_BUCKET`: The name to set for the system's initial bucket (**Required**).
+-	`DOCKER_INFLUXDB_INIT_RETENTION`: The duration the system's initial bucket should retain data. If not set, the initial bucket will retain data forever.
+-	`DOCKER_INFLUXDB_INIT_ADMIN_TOKEN`: The authentication token to associate with the system's initial super-user. If not set, a token will be auto-generated by the system.
+
+It also requires extra volumes to be mounted into the 2.x container:
+
+-	Data from the 1.x instance
+-	Custom config from the 1.x instance (if any)
+
+The upgrade process searches for mounted 1.x data / config in this priority order:
+
+1.	A config file referred to by the `DOCKER_INFLUXDB_INIT_UPGRADE_V1_CONFIG` environment variable
+2.	A data directory referred to by the `DOCKER_INFLUXDB_INIT_UPGRADE_V1_DIR` environment variable
+3.	A config file mounted at `/etc/influxdb/influxdb.conf`
+4.	A data directory mounted at `/var/lib/influxdb`
+
+Finally, the `DOCKER_INFLUXDB_INIT_MODE` environment variable must be set to `upgrade`.
+
+Automated upgrade will generate both data and config files, by default under `/var/lib/influxdb2` and `/etc/influxdb2`. It's recommended to mount volumes at both paths to avoid losing data.
+
+**NOTE:** Automated upgrade will not run if an existing boltdb file is found at the configured path. This behavior allows for the InfluxDB container to reboot post-upgrade without overwriting migrated data.
+
+Find more about the InfluxDB upgrade process [here](https://docs.influxdata.com/influxdb/v2.0/upgrade/v1-to-v2/). See below for examples of common upgrade scenarios.
+
+#### Upgrade Example - Minimal
+
+Assume you've been running a minimal InfluxDB 1.x deployment:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/var/lib/influxdb \
+      %%IMAGE%%:1.8
+```
+
+To upgrade this deployment to InfluxDB 2.x, stop the running InfluxDB 1.x container, then run:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/var/lib/influxdb \
+      -v influxdb2:/var/lib/influxdb2 \
+      -e DOCKER_INFLUXDB_INIT_MODE=upgrade \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      %%IMAGE%%
+```
+
+#### Upgrade Example - Custom InfluxDB 1.x Config
+
+Assume you've been running an InfluxDB 1.x deployment with customized config:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/var/lib/influxdb \
+      -v $PWD/influxdb.conf:/etc/influxdb/influxdb.conf:ro \
+      %%IMAGE%%:1.8
+```
+
+To upgrade this deployment to InfluxDB 2.x, stop the running container, then run:
+
 ```console
 $ docker run -p 8086:8086 \
       -v influxdb:/var/lib/influxdb \
+      -v influxdb2:/var/lib/influxdb2 \
+      -v $PWD/influxdb.conf:/etc/influxdb/influxdb.conf:ro \
+      -e DOCKER_INFLUXDB_INIT_MODE=upgrade \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
       %%IMAGE%%
 ```
 
+#### Upgrade Example - Custom Paths
+
+Assume you've been running an InfluxDB 1.x deployment with data and config mounted at custom paths:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/root/influxdb/data \
+      -v $PWD/influxdb.conf:/root/influxdb/influxdb.conf:ro \
+      %%IMAGE%%:1.8 -config /root/influxdb/influxdb.conf
+```
+
+To upgrade this deployment to InfluxDB 2.x, first decide if you'd like to keep using custom paths, or use the InfluxDB 2.x defaults. If you decide to use the defaults, you'd stop the running InfluxDB 1.x container, then run:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/root/influxdb/data \
+      -v influxdb2:/var/lib/influxdb2 \
+      -v $PWD/influxdb.conf:/root/influxdb/influxdb.conf:ro \
+      -e DOCKER_INFLUXDB_INIT_MODE=upgrade \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      -e DOCKER_INFLUXDB_INIT_UPGRADE_V1_CONFIG=/root/influxdb/influxdb.conf \
+      %%IMAGE%%
+```
+
+To retain your custom paths, you'd run:
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/root/influxdb/data \
+      -v influxdb2:/root/influxdb2/data \
+      -v $PWD/influxdb.conf:/root/influxdb/influxdb.conf:ro \
+      -e DOCKER_INFLUXDB_INIT_MODE=upgrade \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      -e DOCKER_INFLUXDB_INIT_UPGRADE_V1_CONFIG=/root/influxdb/influxdb.conf \
+      -e DOCKER_INFLUXDB_CONFIG_PATH=/root/influxdb2/config.toml \
+      -e DOCKER_INFLUXDB_BOLT_PATH=/root/influxdb2/influxdb.bolt \
+      -e DOCKER_INFLUXDB_ENGINE_PATH=/root/influxdb2/engine \
+      %%IMAGE%%
+```
+
+### Custom Initialization Scripts
+
+The InfluxDB image supports running arbitrary initialization scripts after initial system setup, on both the `setup` and `upgrade` paths. Scripts must have extension `.sh` and be mounted inside of the `/docker-entrypoint-initdb.d` directory. When multiple scripts are present, they will be executed in lexical sort order by name.
+
+As a convenience for script-writers, the image will export a number of variables into the environment before executing any scripts:
+
+-	`INFLUX_CONFIGS_PATH`: Path to the CLI configs file written by `setup`/`upgrade`
+-	`INFLUX_HOST`: URL to the `influxd` instance running setup logic
+-	`DOCKER_INFLUXDB_INIT_USER_ID`: ID of the initial admin user created by `setup`/`upgrade`
+-	`DOCKER_INFLUXDB_INIT_ORG_ID`: ID of the initial organization created by `setup`/`upgrade`
+-	`DOCKER_INFLUXDB_INIT_BUCKET_ID`: ID of the initial bucket created by `setup`/`upgrade`
+
+For example, if you wanted to grant write-access to an InfluxDB 1.x client on your initial bucket, you'd first create the file `$PWD/scripts/setup-v1.sh` with contents:
+
+```bash
+#!/bin/bash
+set -e
+
+influx v1 dbrp create \
+  --bucket-id ${DOCKER_INFLUXDB_INIT_BUCKET_ID} \
+  --db ${V1_DB_NAME} \
+  --rp ${V1_RP_NAME} \
+  --default \
+  --org ${DOCKER_INFLUXDB_INIT_ORG}
+
+influx v1 auth create \
+  --username ${V1_AUTH_USERNAME} \
+  --password ${V1_AUTH_PASSWORD} \
+  --write-bucket ${DOCKER_INFLUXDB_INIT_BUCKET_ID} \
+  --org ${DOCKER_INFLUXDB_INIT_ORG}
+```
+
+Then you'd run:
+
+```console
+$ docker run -p 8086:8086 \
+      -v $PWD/data:/var/lib/influxdb2 \
+      -v $PWD/config:/etc/influxdb2 \
+      -v $PWD/scripts:/docker-entrypoint-initdb.d \
+      -e DOCKER_INFLUXDB_INIT_MODE=setup \
+      -e DOCKER_INFLUXDB_INIT_USERNAME=my-user \
+      -e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
+      -e DOCKER_INFLUXDB_INIT_ORG=my-org \
+      -e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
+      -e V1_DB_NAME=v1-db \
+      -e V1_RP_NAME=v1-rp \
+      -e V1_AUTH_USERNAME=v1-user \
+      -e V1_AUTH_PASSWORD=v1-password \
+      %%IMAGE%%
+```
+
+**NOTE:** Custom scripts will not run if an existing boltdb file is found at the configured path (causing `setup` or `upgrade` to be skipped). This behavior allows for the InfluxDB container to reboot post-initialization without encountering errors from non-idempotent script commands.
+
+## Using this Image - InfluxDB 1.x
+
+### Running the container
+
+The InfluxDB image exposes a shared volume under `/var/lib/influxdb`, so you can mount a host directory to that point to access persisted container data. A typical invocation of the container might be:
+
+```console
+$ docker run -p 8086:8086 \
+      -v $PWD:/var/lib/influxdb \
+      %%IMAGE%%:1.8
+```
+
+Modify `$PWD` to the directory where you want to store data associated with the InfluxDB container.
+
+You can also have Docker control the volume mountpoint by using a named volume.
+
+```console
+$ docker run -p 8086:8086 \
+      -v influxdb:/var/lib/influxdb \
+      %%IMAGE%%:1.8
+```
+
 ### Exposed Ports
 
 The following ports are important and are used by InfluxDB.
@@ -41,8 +448,6 @@ The following ports are important and are used by InfluxDB.
 
 The HTTP API port will be automatically exposed when using `docker run -P`.
 
-Find more about API Endpoints & Ports [here](https://docs.influxdata.com/influxdb/latest/concepts/api/).
-
 ### Configuration
 
 InfluxDB can be either configured from a config file or using environment variables. To mount a configuration file and use it with the server, you can use this command:
@@ -50,7 +455,7 @@ InfluxDB can be either configured from a config file or using environment variab
 Generate the default configuration file:
 
 ```console
-$ docker run --rm %%IMAGE%% influxd config > influxdb.conf
+$ docker run --rm %%IMAGE%%:1.8 influxd config > influxdb.conf
 ```
 
 Modify the default configuration, which will now be available under `$PWD`. Then start the InfluxDB container.
@@ -58,7 +463,7 @@ Modify the default configuration, which will now be available under `$PWD`. Then
 ```console
 $ docker run -p 8086:8086 \
       -v $PWD/influxdb.conf:/etc/influxdb/influxdb.conf:ro \
-      %%IMAGE%% -config /etc/influxdb/influxdb.conf
+      %%IMAGE%%:1.8 -config /etc/influxdb/influxdb.conf
 ```
 
 Modify `$PWD` to the directory where you want to store the configuration file.
@@ -73,7 +478,7 @@ INFLUXDB_META_DIR=/path/to/metadir
 INFLUXDB_DATA_QUERY_LOG_ENABLED=false
 ```
 
-Find more about configuring InfluxDB [here](https://docs.influxdata.com/influxdb/latest/introduction/installation/).
+Find more about configuring InfluxDB [here](https://docs.influxdata.com/influxdb/v1.8/administration/config/).
 
 ### Graphite
 
@@ -82,7 +487,7 @@ InfluxDB supports the Graphite line protocol, but the service and ports are not
 ```console
 docker run -p 8086:8086 -p 2003:2003 \
     -e INFLUXDB_GRAPHITE_ENABLED=true \
-    %%IMAGE%%
+    %%IMAGE%%:1.8
 ```
 
 See the [README on GitHub](https://github.com/influxdata/influxdb/blob/master/services/graphite/README.md) for more detailed documentation to set up the Graphite service. In order to take advantage of graphite templates, you should use a configuration file by outputting a default configuration file using the steps above and modifying the `[[graphite]]` section.
@@ -108,7 +513,7 @@ Read more about this in the [official documentation](https://docs.influxdata.com
 Start the container:
 
 ```console
-$ docker run --name=influxdb -d -p 8086:8086 %%IMAGE%%
+$ docker run --name=influxdb -d -p 8086:8086 %%IMAGE%%:1.8
 ```
 
 Run the influx client in this container:
@@ -120,7 +525,7 @@ $ docker exec -it influxdb influx
 Or run the influx client in a separate container:
 
 ```console
-$ docker run --rm --link=influxdb -it %%IMAGE%% influx -host influxdb
+$ docker run --rm --link=influxdb -it %%IMAGE%%:1.8 influx -host influxdb
 ```
 
 ### Database Initialization
@@ -187,7 +592,7 @@ $ docker run --rm \
       -e INFLUXDB_ADMIN_USER=admin -e INFLUXDB_ADMIN_PASSWORD=supersecretpassword \
       -e INFLUXDB_USER=telegraf -e INFLUXDB_USER_PASSWORD=secretpassword \
       -v $PWD:/var/lib/influxdb \
-      influxdb /init-influxdb.sh
+      %%IMAGE%%:1.8 /init-influxdb.sh
 ```
 
 The above would create the database `db0`, create an admin user with the password `supersecretpassword`, then create the `telegraf` user with your telegraf's secret password. It would then exit and leave behind any files it created in the volume that you mounted.

influxdb/variant-data.md

@@ -2,6 +2,6 @@
 
 *This image requires a valid license key from InfluxData.* Please visit our [products page](https://www.influxdata.com/products/) to learn more.
 
-This image contains the enterprise data node package for clustering. It supports all of the same options as the OSS image, but it needs port 8088 to be exposed to the meta nodes.
+This image contains the enterprise data node package for clustering. It supports all of the same options as the InfluxDB 1.x OSS image, but it needs port 8088 to be exposed to the meta nodes.
 
 Refer to the `influxdb:meta` variant for directions on how to setup a cluster.