From d782592ec9398deef685f89f002b7e55bc655890 Mon Sep 17 00:00:00 2001 From: David Goffredo Date: Fri, 10 Feb 2023 16:35:22 -0500 Subject: [PATCH 1/2] add nginx 1.23.3 --- .circleci/config.yml | 48 +++++++++++++++++++++++++++++++++++++-- bin/generate_jobs_yaml.sh | 6 +++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 674fb971..89d399e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -182,13 +182,13 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ - example: name: "run the example on Debian" - base-image: "nginx:1.23.2" + base-image: "nginx:1.23.3" filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ - example: name: "run the example on Alpine" - base-image: "nginx:1.23.2-alpine" + base-image: "nginx:1.23.3-alpine" filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ @@ -497,6 +497,42 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ branches: ignore: /.*/ + - build: + name: "build on nginx:1.23.3-alpine" + base-image: "nginx:1.23.3-alpine" + build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.23.3-alpine" + nginx-version: "1.23.3" + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + - test: + name: "test on nginx:1.23.3-alpine" + base-image: "nginx:1.23.3-alpine" + nginx-modules-path: "/usr/lib/nginx/modules" + nginx-conf-path: "/etc/nginx/nginx.conf" + requires: + - "build on nginx:1.23.3-alpine" + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + - build: + name: "build on nginx:1.23.3" + base-image: "nginx:1.23.3" + build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.23.3" + nginx-version: "1.23.3" + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + - test: + name: "test on nginx:1.23.3" + base-image: "nginx:1.23.3" + nginx-modules-path: "/usr/lib/nginx/modules" + nginx-conf-path: "/etc/nginx/nginx.conf" + requires: + - "build on nginx:1.23.3" + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+/ - build: name: "build on nginx:1.23.2-alpine" base-image: "nginx:1.23.2-alpine" @@ -505,6 +541,8 @@ workflows: filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: /.*/ - test: name: "test on nginx:1.23.2-alpine" base-image: "nginx:1.23.2-alpine" @@ -515,6 +553,8 @@ workflows: filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: /.*/ - build: name: "build on nginx:1.23.2" base-image: "nginx:1.23.2" @@ -523,6 +563,8 @@ workflows: filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: /.*/ - test: name: "test on nginx:1.23.2" base-image: "nginx:1.23.2" @@ -533,6 +575,8 @@ workflows: filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: /.*/ - build: name: "build on nginx:1.23.1-alpine" base-image: "nginx:1.23.1-alpine" diff --git a/bin/generate_jobs_yaml.sh b/bin/generate_jobs_yaml.sh index 3782539f..b98840df 100755 --- a/bin/generate_jobs_yaml.sh +++ b/bin/generate_jobs_yaml.sh @@ -29,8 +29,10 @@ amazonlinux:2.0.20220406.1 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf amazonlinux:2.0.20220316.0 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf amazonlinux:2.0.20220218.1 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf amazonlinux:2.0.20220121.0 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf -nginx:1.23.2-alpine 1.23.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf always -nginx:1.23.2 1.23.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf always +nginx:1.23.3-alpine 1.23.3 /usr/lib/nginx/modules /etc/nginx/nginx.conf always +nginx:1.23.3 1.23.3 /usr/lib/nginx/modules /etc/nginx/nginx.conf always +nginx:1.23.2-alpine 1.23.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf +nginx:1.23.2 1.23.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf nginx:1.23.1-alpine 1.23.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf nginx:1.23.1 1.23.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf nginx:1.23.0-alpine 1.23.0 /usr/lib/nginx/modules /etc/nginx/nginx.conf From ac999fe76ce8cb37d3d6e753e17494d13ee37999 Mon Sep 17 00:00:00 2001 From: David Goffredo Date: Fri, 10 Feb 2023 16:37:26 -0500 Subject: [PATCH 2/2] examples cannot refer to releases that don't yet exist --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89d399e3..7fffa9ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -182,13 +182,13 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ - example: name: "run the example on Debian" - base-image: "nginx:1.23.3" + base-image: "nginx:1.23.2" filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/ - example: name: "run the example on Alpine" - base-image: "nginx:1.23.3-alpine" + base-image: "nginx:1.23.2-alpine" filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+/