From 9d2c44ac686e34d9863157d024cea404f00c2eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 18 Sep 2017 09:33:58 +0200 Subject: [PATCH 1/4] Use monasca/python based monasca/agent-base Update images for: * agent-collector * agent-forwared due to changes done for monasca/agent-base. --- monasca-agent-collector/Dockerfile | 3 ++- monasca-agent-collector/build.yml | 2 ++ monasca-agent-forwarder/Dockerfile | 3 ++- monasca-agent-forwarder/build.yml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/monasca-agent-collector/Dockerfile b/monasca-agent-collector/Dockerfile index a69cfae8b..078ba1a1d 100644 --- a/monasca-agent-collector/Dockerfile +++ b/monasca-agent-collector/Dockerfile @@ -1,4 +1,5 @@ -FROM monasca/agent-base:master-20170901-210328 +ARG MON_AGENT_BASE_VERSION +FROM monasca/agent-base:${MON_AGENT_BASE_VERSION} ARG AGENT_USER="mon-agent" diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml index 1e9fe9572..2d8c020f4 100644 --- a/monasca-agent-collector/build.yml +++ b/monasca-agent-collector/build.yml @@ -3,3 +3,5 @@ variants: - tag: master aliases: - :master-{date}-{time} + args: + MON_AGENT_BASE_VERSION: master-20170901-210328 diff --git a/monasca-agent-forwarder/Dockerfile b/monasca-agent-forwarder/Dockerfile index fb7a0bbd7..aaf38ce7c 100644 --- a/monasca-agent-forwarder/Dockerfile +++ b/monasca-agent-forwarder/Dockerfile @@ -1,4 +1,5 @@ -FROM monasca/agent-base:master-20170901-210328 +ARG MON_AGENT_BASE_VERSION +FROM monasca/agent-base:${MON_AGENT_BASE_VERSION} ARG AGENT_USER="mon-agent" diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml index 9fe756592..ac1a2dbde 100644 --- a/monasca-agent-forwarder/build.yml +++ b/monasca-agent-forwarder/build.yml @@ -3,3 +3,5 @@ variants: - tag: master aliases: - :master-{date}-{time} + args: + MON_AGENT_BASE_VERSION: master-20170901-210328 From 03ca0fd4c740268ba66074cd4266884a0acb9c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 18 Sep 2017 23:18:26 +0200 Subject: [PATCH 2/4] Update build.yml Bump base monasca/agent-base to master-20170918-171757 --- monasca-agent-collector/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml index 2d8c020f4..b1f77f019 100644 --- a/monasca-agent-collector/build.yml +++ b/monasca-agent-collector/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170901-210328 + MON_AGENT_BASE_VERSION: master-20170918-171757 From 6b28f785766df226cf021dd1567d06ab5780af35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 18 Sep 2017 23:18:44 +0200 Subject: [PATCH 3/4] Update build.yml Bump base image to master-20170918-171757 --- monasca-agent-forwarder/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml index ac1a2dbde..9493eb31f 100644 --- a/monasca-agent-forwarder/build.yml +++ b/monasca-agent-forwarder/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170901-210328 + MON_AGENT_BASE_VERSION: master-20170918-171757 From be1d912f177fc5bc7db41cbc94089fd42e7a1204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Tue, 19 Sep 2017 06:38:18 +0200 Subject: [PATCH 4/4] Do not specify path to agent's binaries Both monasca-collector and monasca-forwarder binaries are available globally in PATH of the container, hence there is no real need to access them using absolute path. --- monasca-agent-collector/start.sh | 2 +- monasca-agent-forwarder/start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh index 638ad53c8..afc83a1f3 100755 --- a/monasca-agent-collector/start.sh +++ b/monasca-agent-collector/start.sh @@ -68,4 +68,4 @@ done template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/bin/monasca-collector foreground +monasca-collector foreground diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh index eb058d223..85f9910c6 100755 --- a/monasca-agent-forwarder/start.sh +++ b/monasca-agent-forwarder/start.sh @@ -24,4 +24,4 @@ fi template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/bin/monasca-forwarder +monasca-forwarder