From ace10caee1e70eb0f8cead34914ea010a70149af Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 24 Nov 2016 07:52:38 +0700 Subject: [PATCH 1/5] Update docker-compose.yml update version numbers --- templates/weavescope/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/weavescope/0/docker-compose.yml b/templates/weavescope/0/docker-compose.yml index c10f9b5..6e69264 100644 --- a/templates/weavescope/0/docker-compose.yml +++ b/templates/weavescope/0/docker-compose.yml @@ -1,5 +1,5 @@ weavescope-probe: - image: weaveworks/scope:0.11.1 + image: weaveworks/scope:1.0.0 privileged: true net: host pid: host @@ -17,7 +17,7 @@ weavescope-probe: - "--no-app" - "weavescope-app" weavescope-app: - image: weaveworks/scope:0.11.1 + image: weaveworks/scope:1.0.0 ports: - "4040:4040" command: From 5eef1c264265577e053fa390b7f4c9d129560979 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 24 Nov 2016 07:58:44 +0700 Subject: [PATCH 2/5] Update rancher-compose.yml version numbers --- templates/weavescope/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/weavescope/0/rancher-compose.yml b/templates/weavescope/0/rancher-compose.yml index 2bd87d9..4560ee9 100644 --- a/templates/weavescope/0/rancher-compose.yml +++ b/templates/weavescope/0/rancher-compose.yml @@ -1,4 +1,4 @@ .catalog: name: weavescope - version: 0.11.1 + version: 1.0.0 description: "Monitoring, visualisation and management for Docker" From afa843eeef9c4d2e01e09ee6005f49b7409b8747 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 24 Nov 2016 08:00:08 +0700 Subject: [PATCH 3/5] Update config.yml version numbers --- templates/weavescope/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/weavescope/config.yml b/templates/weavescope/config.yml index f83c3f7..27d7097 100644 --- a/templates/weavescope/config.yml +++ b/templates/weavescope/config.yml @@ -1,6 +1,6 @@ name: Weave Scope description: "Monitoring, visualisation and management for Docker" -version: 0.12.0 +version: 1.0.0 category: Monitoring maintainer: "Ilya Dmitrichenko " license: "Apache License v2.0" From fe14726490e6e00065ab6558066ac4fa95bbc930 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 24 Nov 2016 08:00:53 +0700 Subject: [PATCH 4/5] Delete docker-compose.yml no longer needed --- templates/weavescope/1/docker-compose.yml | 24 ----------------------- 1 file changed, 24 deletions(-) delete mode 100644 templates/weavescope/1/docker-compose.yml diff --git a/templates/weavescope/1/docker-compose.yml b/templates/weavescope/1/docker-compose.yml deleted file mode 100644 index 2ce9059..0000000 --- a/templates/weavescope/1/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ -weavescope-probe: - image: weaveworks/scope:0.12.0 - privileged: true - net: host - pid: host - labels: - io.rancher.scheduler.global: true - io.rancher.container.dns: true - links: - - weavescope-app - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - tty: true - command: - - "--probe.docker" - - "true" - - "--no-app" - - "weavescope-app" -weavescope-app: - image: weaveworks/scope:0.12.0 - ports: - - "4040:4040" - command: - - "--no-probe" From 4c80a09055f30816f913cfcb1ce7857d8810f3a3 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 24 Nov 2016 08:01:08 +0700 Subject: [PATCH 5/5] Delete rancher-compose.yml no longer needed --- templates/weavescope/1/rancher-compose.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 templates/weavescope/1/rancher-compose.yml diff --git a/templates/weavescope/1/rancher-compose.yml b/templates/weavescope/1/rancher-compose.yml deleted file mode 100644 index 482bf8c..0000000 --- a/templates/weavescope/1/rancher-compose.yml +++ /dev/null @@ -1,4 +0,0 @@ -.catalog: - name: weavescope - version: 0.12.0 - description: "Monitoring, visualisation and management for Docker"