From 86214cd0556a3d8de2be72fedeb7eeaeb69327e5 Mon Sep 17 00:00:00 2001 From: Luke Wood Date: Tue, 18 Jun 2019 13:45:21 +0100 Subject: [PATCH 1/3] Add changelog entry for twisted version upgrade --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b19262..39f6840 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.1.0 + + * [dependencies] Bump twisted from 18.9.0 to 19.2.1 (#6) + # 1.0.0 * Expose four metrics from the filesystem: From 48f45940801059b1169bbddfdebe9f7a121ced09 Mon Sep 17 00:00:00 2001 From: Luke Wood Date: Tue, 18 Jun 2019 13:50:29 +0100 Subject: [PATCH 2/3] Make python build version match the packaged Docker version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d86b001..14bd3b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: python services: - docker @@ -11,7 +12,7 @@ env: # REGISTRY_PASS= - secure: "D4I4uElXOoNfyCDeoOFGo3MqW0KdyI7jFmWisgrQrB2QN2cgeVQNWow0RF5TujApJrHM2p36YTFQI7tSy3Jp7EaqWj1Zf/L1mHhgbbbvTyrry/XaZ/Aa2j+yQrFGhdnuf4PDUw6ws1j94h1IhU1jdDvDIyFsX5QFZFMd/A9QUAwgPAC39I52zGDOnORCpRI4FKzF3MgV6IpmsIKMCT5uFo3A5F7jPBk62fU3bNMfS31KXMK5KW1XEzQQTTzbzmudDQhoKPNSqCJYx3FZK2RP2WOLge6wVWBQHhxsx6WwKlEdTgfgt1OVkYMMBCJMEvCNfcAqVqT8z/QJPgrWAgTwFx8Pjeklk43cX/s1JLMLMBGZe9OX6Q1dXKoTuRKfbJMqptL7jEaCfCdmG9MmOioJselbs++h0OX3xAQEv6r9zcs5V5lEUp1tDysRFsJ0jxpoPW5M0c61M0B3MCdrPrjpv3/QdZ2zZnTyXoqs7dTWs7o7jfOExEfgVZt4SOP5wAXL2azlwZmO/crm5lbeecVZGiW0ak2jRfdqWO/Zy26tdDkFa2L8XHhjccJ8fBHsWBcNl28E81FuN0DoLZJuqiJqIiPcVC546NOMPKnJxhaR5FlGGDwFjH0+RaAFqIAQa0KC6En37R8d1S515v9SECQQ0gUH7PU6GIVAytfx0G8tl/4=" python: - - "3.6" + - "3.7" before_install: - sudo curl -L https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /usr/local/bin/goss - sudo curl -L https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/dgoss -o /usr/local/bin/dgoss From a1bb198e1205d70f0bb1f4b5d8965e9ea306c76c Mon Sep 17 00:00:00 2001 From: Luke Wood Date: Tue, 18 Jun 2019 13:59:17 +0100 Subject: [PATCH 3/3] Add note of Docker image rebuild to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f6840..753aeb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.1.0 + * [security] Rebuild image using latest upstream python:3.7-alpine tag to fix CVE-2019-5021 (#7) * [dependencies] Bump twisted from 18.9.0 to 19.2.1 (#6) # 1.0.0