From 76ff974f157f63308176615b710d469db5067138 Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Wed, 21 Jun 2023 11:22:39 -0400 Subject: [PATCH 01/14] NginxInc 2.3.0 --- Dockerfile.nginxinc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.nginxinc b/Dockerfile.nginxinc index dbe865a..a63e38a 100644 --- a/Dockerfile.nginxinc +++ b/Dockerfile.nginxinc @@ -1,4 +1,4 @@ -ARG NGINX_INGRESS_VERSION=${NGINX_INGRESS_VERSION:-2.2.0-alpine} +ARG NGINX_INGRESS_VERSION=${NGINX_INGRESS_VERSION:-2.3.0-alpine} FROM nginx/nginx-ingress:${NGINX_INGRESS_VERSION} ARG PKGNAME=${PKGNAME:-nginx-module-sigsci-nxo} From 53fba71a7df266ce0a915ee4e3f3424729d41cc1 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 17:54:44 +0100 Subject: [PATCH 02/14] fix-pipeline-issues, use 2.3.0 --- Dockerfile.nginxinc | 5 +++-- sigsci-nginxinc-values.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile.nginxinc b/Dockerfile.nginxinc index a63e38a..df89d5b 100644 --- a/Dockerfile.nginxinc +++ b/Dockerfile.nginxinc @@ -1,5 +1,6 @@ -ARG NGINX_INGRESS_VERSION=${NGINX_INGRESS_VERSION:-2.3.0-alpine} -FROM nginx/nginx-ingress:${NGINX_INGRESS_VERSION} +ARG NGINX_INGRESS_VERSION=${NGINX_INGRESS_VERSION} +ARG CONTAINER_BASE=alpine +FROM nginx/nginx-ingress:${NGINX_INGRESS_VERSION}-${CONTAINER_BASE} ARG PKGNAME=${PKGNAME:-nginx-module-sigsci-nxo} # Change to the root user to update the container diff --git a/sigsci-nginxinc-values.yaml b/sigsci-nginxinc-values.yaml index 7edf4b9..266b2d1 100644 --- a/sigsci-nginxinc-values.yaml +++ b/sigsci-nginxinc-values.yaml @@ -3,7 +3,7 @@ controller: image: ## Replaces the default nginx-controller image with a custom image that contains the Signal Sciences nginx Module repository: signalsciences/sigsci-nginxinc-ingress-controller - tag: "2.2.0" + tag: "2.3.0" pullPolicy: IfNotPresent # Load module and set sigsci_agent_host From a033666c2496d73db70ddca1351b3ca8c519c14b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:01:35 +0100 Subject: [PATCH 03/14] add manual trigger for nginxinc releases --- .github/workflows/manual-nginxinc.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/manual-nginxinc.yml diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml new file mode 100644 index 0000000..3cd486f --- /dev/null +++ b/.github/workflows/manual-nginxinc.yml @@ -0,0 +1,22 @@ +name: Manual Push NginxInc Image to DockerHub + +on: + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_API_TOKEN }} + - name: Build and Push image to docker Hub + env: + TAG: 2.3.0 + REPO: signalsciences/sigsci-nginxinc-ingress-controller + run: | + docker buildx create --name build_multiarch --use + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file From 58c6608a910dab2863839202958ad0ccac484b4d Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:03:24 +0100 Subject: [PATCH 04/14] fix format --- .github/workflows/manual-nginxinc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 3cd486f..56684d2 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -19,4 +19,4 @@ jobs: REPO: signalsciences/sigsci-nginxinc-ingress-controller run: | docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From da07c2028823bab1f6eec91bf44dbe567e7202cc Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:27:25 +0100 Subject: [PATCH 05/14] fix manual build trigger dockerfile path --- .github/workflows/manual-nginxinc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 56684d2..8cfc041 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -16,7 +16,7 @@ jobs: - name: Build and Push image to docker Hub env: TAG: 2.3.0 - REPO: signalsciences/sigsci-nginxinc-ingress-controller + REPO: signalsciences/sigsci-nginx-ingress-controller run: | docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . + docker buildx . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From 33d177698edc9d21dd7102750e57335f19c1f67b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:29:06 +0100 Subject: [PATCH 06/14] remove multiarch from manual build trigger for nginxinc --- .github/workflows/manual-nginxinc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 8cfc041..2f9fd5c 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -18,5 +18,4 @@ jobs: TAG: 2.3.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx create --name build_multiarch --use docker buildx . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From e202ea1b96639c78e67665468e3101dffda7bf64 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:33:23 +0100 Subject: [PATCH 07/14] fix manual trigger for nginxinc --- .github/workflows/manual-nginxinc.yml | 2 +- .github/workflows/manual.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 2f9fd5c..52a35c7 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -18,4 +18,4 @@ jobs: TAG: 2.3.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . + docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 75d9122..0cca9d5 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -19,4 +19,4 @@ jobs: REPO: signalsciences/sigsci-nginx-ingress-controller run: | docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file From 808a5fffce46fd9e522b225a752e9d3ceebb1816 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:35:40 +0100 Subject: [PATCH 08/14] fix manual trigger for nginxinc --- .github/workflows/manual-nginxinc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 52a35c7..9090f7e 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -18,4 +18,4 @@ jobs: TAG: 2.3.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . + docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file From 89b6ea0e2a6dba7f491d97eb6fa1ceec653d1bd7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:36:19 +0100 Subject: [PATCH 09/14] fix manual trigger for nginxinc --- .github/workflows/manual.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 0cca9d5..bceab61 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -19,4 +19,4 @@ jobs: REPO: signalsciences/sigsci-nginx-ingress-controller run: | docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From 0b88c360d9a64d3131448ea4e1af1cb7b44e8420 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:37:38 +0100 Subject: [PATCH 10/14] fix manual trigger for nginxinc --- .github/workflows/manual-nginxinc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 9090f7e..52a35c7 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -18,4 +18,4 @@ jobs: TAG: 2.3.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file + docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From 037e02903a0f4d0b12d381d8c8f86c3e0e963e7e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:39:06 +0100 Subject: [PATCH 11/14] revert ingress-nginx manual trigger --- .github/workflows/manual-nginxinc.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 52a35c7..75d9122 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -1,4 +1,4 @@ -name: Manual Push NginxInc Image to DockerHub +name: Manual Push Docker Hub Image on: workflow_dispatch: @@ -15,7 +15,8 @@ jobs: password: ${{ secrets.DOCKERHUB_API_TOKEN }} - name: Build and Push image to docker Hub env: - TAG: 2.3.0 + TAG: 1.8.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . + docker buildx create --name build_multiarch --use + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file From d863d2e68f0a1bb3d8c21c5c3ae1c405eb9d2d70 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:39:59 +0100 Subject: [PATCH 12/14] fix nginxinc manual trigger --- .github/workflows/manual-nginxinc.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 75d9122..52a35c7 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -1,4 +1,4 @@ -name: Manual Push Docker Hub Image +name: Manual Push NginxInc Image to DockerHub on: workflow_dispatch: @@ -15,8 +15,7 @@ jobs: password: ${{ secrets.DOCKERHUB_API_TOKEN }} - name: Build and Push image to docker Hub env: - TAG: 1.8.0 + TAG: 2.3.0 REPO: signalsciences/sigsci-nginx-ingress-controller run: | - docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file + docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . From 48d4b63eefc9c23adf2b3f014f050b0065545bb7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 Jun 2023 18:40:38 +0100 Subject: [PATCH 13/14] revert ingress-nginx manual trigger --- .github/workflows/manual.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index bceab61..75d9122 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -19,4 +19,4 @@ jobs: REPO: signalsciences/sigsci-nginx-ingress-controller run: | docker buildx create --name build_multiarch --use - docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . + docker buildx build --platform linux/amd64,linux/arm64 --build-arg NGINX_INGRESS_VERSION=v${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . \ No newline at end of file From f0f32af26bf2ec0db01ef4a0c5cb4f5db96c488d Mon Sep 17 00:00:00 2001 From: paul-fastly Date: Wed, 21 Jun 2023 15:16:43 -0400 Subject: [PATCH 14/14] Restore inc --- .github/workflows/manual-nginxinc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml index 52a35c7..71bfce8 100644 --- a/.github/workflows/manual-nginxinc.yml +++ b/.github/workflows/manual-nginxinc.yml @@ -16,6 +16,6 @@ jobs: - name: Build and Push image to docker Hub env: TAG: 2.3.0 - REPO: signalsciences/sigsci-nginx-ingress-controller + REPO: signalsciences/sigsci-nginxinc-ingress-controller run: | docker buildx build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push .