From 320257e17b3a03915ed781fe955e39e1f5255591 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 29 Jun 2020 22:11:03 +0100 Subject: Update collectd tags to use main instead of master The branch names have been updated, and main has replaced master, which will no longer be updated. Change-Id: Idfce21554594f15a831c8b7ec769eb85d52068b1 Signed-off-by: Emma Foley --- docker/README_collectd | 6 +++--- docker/barometer-collectd-experimental/Dockerfile | 2 +- .../barometer-collectd-experimental/collectd_apply_pull_request.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/README_collectd b/docker/README_collectd index c922ab64..baa0ff6e 100644 --- a/docker/README_collectd +++ b/docker/README_collectd @@ -19,8 +19,8 @@ This Dockerfile provides instruction for building collect in isolated container. There are currently two variants of collectd container: - barometer-collectd - it is based on stable collect release - barometer-collectd-master - development container that is based on - latest 'master' branch for collectd project. It contains all available - collectd plugins and features that are available on 'master' branch but + latest 'main' branch for collectd project. It contains all available + collectd plugins and features that are available on 'main' branch but some issues with configuration or stability may occur ------------------------------------------------------------------------------ @@ -48,7 +48,7 @@ sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs:/op ------------------------------------------------------------------------------ 4. INSTALLATION NOTES: barometer-collectd-master (development container) -To build docker barometer-collectd-master container run (it is based on master branch from collectd): +To build docker barometer-collectd-master container run (it is based on main branch from collectd): sudo docker build -f ./docker/barometer-collectd-master/Dockerfile . from root barometer folder. diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index cf94df2f..49016d9b 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -31,7 +31,7 @@ COPY . ${repos_dir}/barometer COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \ ${repos_dir}/barometer/src/collectd/ -# copying additional experimental configs on top of configs for 'master' +# copying additional experimental configs on top of configs for 'main' # branch release COPY docker/barometer-collectd-experimental/experimental-configs/* \ ${repos_dir}/barometer/src/collectd/collectd_sample_configs-master/ diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh index 831aba37..45a2a2cd 100755 --- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh +++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh @@ -15,7 +15,7 @@ # # This files contains list of pull requests to be applied on top -# of master branch before building collectd included in docker +# of main branch before building collectd included in docker # collectd-experimental container # Space/newline separated list of pull requests IDs -- cgit 1.2.3-korg