Skip to content

Commit 4976480

Browse files
authored
Re-publish to pick up latest Nginx module for 1.11.6 (#84)
* Use Fastly URLs * Include the module version in the tag * Apparently spaces aren't allowed in the docker tag * Use something semver compliant
1 parent ab643ed commit 4976480

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
password: ${{ secrets.DOCKERHUB_API_TOKEN }}
1616
- name: Build and Push image to docker Hub
1717
env:
18-
TAG: 1.12.2
18+
TAG: 1.11.6+fastly1.3.2
1919
REPO: signalsciences/sigsci-nginx-ingress-controller
2020
run: |
2121
docker buildx create --name build_multiarch --use

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN apk -U upgrade && apk add --no-cache gnupg wget curl --virtual ./build_deps
1717
# Figure out which nginx is installed in the container
1818
&& NGXVERSION=$(nginx -v 2>&1 | sed 's%^[^/]*/\([0-9]*\.[0-9]*\.[0-9]*\).*%\1%') \
1919
# Get the latest version of the sigsci nginx native module
20-
&& MODULE_VERSION=$(wget -O- -q https://dl.signalsciences.net/sigsci-module-nginx-native/VERSION) \
20+
&& MODULE_VERSION=$(wget -O- -q https://dl.security.fastly.com/sigsci-module-nginx-native/VERSION) \
2121
# Get the correct sigsci nginx native module based on alpine version, nginx version, and module version
22-
&& wget https://apk.signalsciences.net/sigsci_apk.pub && mv sigsci_apk.pub /etc/apk/keys \
23-
&& echo "https://apk.signalsciences.net/${ALPINE_RELEASE}/main" | tee -a /etc/apk/repositories \
22+
&& wget https://apk.security.fastly.com/sigsci_apk.pub && mv sigsci_apk.pub /etc/apk/keys \
23+
&& echo "https://apk.security.fastly.com/${ALPINE_RELEASE}/main" | tee -a /etc/apk/repositories \
2424
&& apk add ${PKGNAME}-${NGXVERSION} \
2525
&& ln -s /usr/lib/nginx/modules/ngx_http_sigsci_module.so /etc/nginx/modules/ngx_http_sigsci_module.so \
2626
&& sed -i 's@^pid.*@&\nload_module /usr/lib/nginx/modules/ngx_http_sigsci_module.so;\n@' /etc/nginx/nginx.conf \

Dockerfile.nginxinc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN apk update && apk add --no-cache gnupg wget --virtual ./build_deps \
1717
# Figure out which nginx is installed in the container
1818
&& NGXVERSION=$(nginx -v 2>&1 | sed 's%^[^/]*/\([0-9]*\.[0-9]*\.[0-9]*\).*%\1%') \
1919
# Get the latest version of the sigsci nginx native module
20-
&& MODULE_VERSION=$(wget -O- -q https://dl.signalsciences.net/sigsci-module-nginx-native/VERSION) \
20+
&& MODULE_VERSION=$(wget -O- -q https://dl.security.fastly.com/sigsci-module-nginx-native/VERSION) \
2121
# Get the correct sigsci nginx native module based on alpine version, nginx version, and module version
22-
&& wget https://apk.signalsciences.net/sigsci_apk.pub && mv sigsci_apk.pub /etc/apk/keys \
23-
&& echo "https://apk.signalsciences.net/${ALPINE_RELEASE}/main" | tee -a /etc/apk/repositories \
22+
&& wget https://apk.security.fastly.com/sigsci_apk.pub && mv sigsci_apk.pub /etc/apk/keys \
23+
&& echo "https://apk.security.fastly.com/${ALPINE_RELEASE}/main" | tee -a /etc/apk/repositories \
2424
&& apk add ${PKGNAME}-${NGXVERSION} \
2525
&& sed -i 's@^pid.*@&\nload_module /usr/lib/nginx/modules/ngx_http_sigsci_module.so;\n@' /etc/nginx/nginx.conf \
2626
# cleanup

0 commit comments

Comments
 (0)