Merge changes from topic "container_update"

* changes:
  [docs] Update Docker install guide
  Update collectd container to use 5.11

diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 1eb6f8d..30b7385 100755 (executable)
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -25,4 +25,4 @@ CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4
 CMTCAT_VERSION="v1.1.0"
 
 COLLECTD_REPO=https://github.com/collectd/collectd.git
-COLLECTD_BRANCH=collectd-5.10
+COLLECTD_BRANCH=collectd-5.11

diff --git a/docker/barometer-influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile
index f84b22d..5a640c2 100644 (file)
--- a/docker/barometer-influxdb/Dockerfile
+++ b/docker/barometer-influxdb/Dockerfile
@@ -15,5 +15,5 @@
 
 FROM influxdb:1.3.7
 
-RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.10/src/types.db -O /types.db
+RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.11/src/types.db -O /types.db
 COPY ./influxdb.conf /etc/influxdb/influxdb.conf

diff --git a/docs/release/userguide/installguide.docker.rst b/docs/release/userguide/installguide.docker.rst
index d1f5564..a342bbb 100644 (file)
--- a/docs/release/userguide/installguide.docker.rst
+++ b/docs/release/userguide/installguide.docker.rst
@@ -234,11 +234,11 @@ The output should be something like:
 
 .. code:: bash
 
-   Unable to find image 'hello-world:latest' locally
-   latest: Pulling from library/hello-world
-   5b0f327be733: Pull complete
-   Digest: sha256:07d5f7800dfe37b8c2196c7b1c524c33808ce2e0f74e7aa00e603295ca9a0972
-   Status: Downloaded newer image for hello-world:latest
+   Trying to pull docker.io/library/hello-world...Getting image source signatures
+   Copying blob 0e03bdcc26d7 done
+   Copying config bf756fb1ae done
+   Writing manifest to image destination
+   Storing signatures
 
    Hello from Docker!
    This message shows that your installation appears to be working correctly.
@@ -251,11 +251,14 @@ The output should be something like:
     4. The Docker daemon streamed that output to the Docker client, which sent it
        to your terminal.
 
-To try something more ambitious, you can run an Ubuntu container with:
+   To try something more ambitious, you can run an Ubuntu container with:
+    $ docker run -it ubuntu bash
 
-.. code:: bash
+   Share images, automate workflows, and more with a free Docker ID:
+    https://hub.docker.com/
 
-    $ docker run -it ubuntu bash
+   For more examples and ideas, visit:
+    https://docs.docker.com/get-started/
 
 Build and Run Collectd Docker Image
 -----------------------------------
@@ -265,22 +268,22 @@ Collectd-barometer flavors
 
 Before starting to build and run the Collectd container, understand the available
 flavors of Collectd containers:
-  * barometer-collectd - stable release, based on collectd 5.8
+  * barometer-collectd - stable release, based on collectd 5.11
   * barometer-collectd-master - release based on collectd 'master' branch
   * barometer-collectd-experimental - release based on collectd 'master'
-    branch that also includes set of experimental(not yet merged into upstream)
+    branch that also includes set of experimental (not yet merged into upstream)
     pull requests
 
 .. note::
    Experimental container is not tested across various OS'es and the stability
    of the container can change. Usage of experimental flavor is at users risk.
 
-Stable barometer-collectd container is intended for work in production
+Stable `barometer-collectd` container is intended for work in production
 environment as it is based on latest collectd official release.
 `Barometer-collectd-master` and `barometer-collectd-experimental` containers
 can be used in order to try new collectd features.
-All flavors are located in `barometer` git repository - respective dockerfiles
-are stored in subdirectories of 'docker/' directory
+All flavors are located in `barometer` git repository - respective Dockerfiles
+are stored in subdirectories of `docker/` directory
 
 
 .. code:: bash

diff --git a/src/package-list.mk b/src/package-list.mk
index d5fedf7..a5c7bcf 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -27,7 +27,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
 #                   set pull requests with experimental features
 ifeq ($(COLLECTD_FLAVOR), stable)
 # using latest stable release
-       COLLECTD_TAG ?= collectd-5.10
+       COLLECTD_TAG ?= collectd-5.11
        SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
 else
 # 'master' and 'experimental' collectd flavors are both using