diff --git a/.github/workflows/manual-nginxinc.yml b/.github/workflows/manual-nginxinc.yml new file mode 100644 index 0000000..71bfce8 --- /dev/null +++ b/.github/workflows/manual-nginxinc.yml @@ -0,0 +1,21 @@ +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 build . --file Dockerfile.nginxinc --build-arg NGINX_INGRESS_VERSION=${TAG} --tag ${REPO}:${TAG} --tag ${REPO}:latest --push . diff --git a/Dockerfile.nginxinc b/Dockerfile.nginxinc index dbe865a..df89d5b 100644 --- a/Dockerfile.nginxinc +++ b/Dockerfile.nginxinc @@ -1,5 +1,6 @@ -ARG NGINX_INGRESS_VERSION=${NGINX_INGRESS_VERSION:-2.2.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