From 0608b0066b82b28087555f25f2ef49e34dcff4bb Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 28 Oct 2019 16:41:02 +0100 Subject: [PATCH 1/4] Add sunet build system to docker-custodian --- .jenkins.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .jenkins.yaml diff --git a/.jenkins.yaml b/.jenkins.yaml new file mode 100644 index 0000000..c8dede9 --- /dev/null +++ b/.jenkins.yaml @@ -0,0 +1,11 @@ +triggers: + cron: "@weekly" + +builders: + - script + - docker + +script: + - python3.7 -m venv venv + - venv/bin/pip install --upgrade setuptools pip wheel tox + - venv/bin/tox From d1a42211102285f87445a364b0a9cbda4f126086 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 28 Oct 2019 09:50:55 +0100 Subject: [PATCH 2/4] Update generated configs to make test happy --- .pre-commit-config.yaml | 4 ++-- .secrets.baseline | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8e3af55..7963bf8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: git://github.com/pre-commit/pre-commit-hooks - rev: v2.2.1 + rev: v2.3.0 hooks: - id: check-added-large-files - id: check-docstring-first @@ -14,7 +14,7 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace - repo: git://github.com/Yelp/detect-secrets - rev: v0.12.2 + rev: v0.12.7 hooks: - id: detect-secrets args: ['--baseline', '.secrets.baseline'] diff --git a/.secrets.baseline b/.secrets.baseline index 4902d77..388b336 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "tests/.*", "lines": null }, - "generated_at": "2019-04-24T14:36:38Z", + "generated_at": "2019-10-28T08:48:40Z", "plugins_used": [ { "base64_limit": 4.5, @@ -18,5 +18,9 @@ } ], "results": {}, - "version": "0.12.2" + "version": "0.12.7", + "word_list": { + "file": null, + "hash": null + } } From d9d0b9ad3d63cc09c72f3ccaabf330b89ac6b403 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 28 Oct 2019 09:51:41 +0100 Subject: [PATCH 3/4] Test on python 3.7 instead of 3.5 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8713cf8..e56b39c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py35,py36 +envlist = py27,py36,py37 [testenv] deps = From 445b8c2522b0902cb2afe394396c19b6a26c0364 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 28 Oct 2019 16:43:29 +0100 Subject: [PATCH 4/4] Build container on modern alpine --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3ca519..7cc887e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM alpine:3.2 -MAINTAINER Kyle Anderson +FROM alpine +MAINTAINER Anton Lundin RUN apk add -U python py-pip ADD requirements.txt /code/requirements.txt