Skip to content

Commit 085232b

Browse files
alessfgalessfg
authored
Move NGINX package source to GitHub (#244)
1 parent 63c0059 commit 085232b

16 files changed

+30
-30
lines changed

‎Dockerfile-alpine-perl.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN set -x \
4040
&& su nobody -s /bin/sh -c " \
4141
export HOME=${tempDir} \
4242
&& cd ${tempDir} \
43-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/%%REVISION%%.tar.gz \
43+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/%%REVISION%%.tar.gz \
4444
&& PKGOSSCHECKSUM=\"%%PKGOSSCHECKSUM%% *%%REVISION%%.tar.gz\" \
4545
&& if [ \"\$(openssl sha512 -r %%REVISION%%.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
4646
echo \"pkg-oss tarball checksum verification succeeded!\"; \

‎Dockerfile-alpine-slim.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/%%REVISION%%.tar.gz \
59+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/%%REVISION%%.tar.gz \
6060
&& PKGOSSCHECKSUM=\"%%PKGOSSCHECKSUM%% *%%REVISION%%.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r %%REVISION%%.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \

‎Dockerfile-alpine.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN set -x \
4646
&& su nobody -s /bin/sh -c " \
4747
export HOME=${tempDir} \
4848
&& cd ${tempDir} \
49-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/%%REVISION%%.tar.gz \
49+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/%%REVISION%%.tar.gz \
5050
&& PKGOSSCHECKSUM=\"%%PKGOSSCHECKSUM%% *%%REVISION%%.tar.gz\" \
5151
&& if [ \"\$(openssl sha512 -r %%REVISION%%.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5252
echo \"pkg-oss tarball checksum verification succeeded!\"; \

‎Dockerfile-debian-perl.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN set -x; \
4242
cd "$tempDir" \
4343
&& REVISION="%%REVISION%%" \
4444
&& REVISION=${REVISION%~*} \
45-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
45+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
4646
&& PKGOSSCHECKSUM="%%PKGOSSCHECKSUM%% *${REVISION}.tar.gz" \
4747
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
4848
echo "pkg-oss tarball checksum verification succeeded!"; \

‎Dockerfile-debian.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN set -x \
7070
cd "$tempDir" \
7171
&& REVISION="%%REVISION%%" \
7272
&& REVISION=${REVISION%~*} \
73-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
73+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
7474
&& PKGOSSCHECKSUM="%%PKGOSSCHECKSUM%% *${REVISION}.tar.gz" \
7575
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
7676
echo "pkg-oss tarball checksum verification succeeded!"; \

‎mainline/alpine-perl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ RUN set -x \
5151
&& su nobody -s /bin/sh -c " \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
54-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55+
&& PKGOSSCHECKSUM=\"e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5656
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \

‎mainline/alpine-slim/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN set -x \
6262
&& su nobody -s /bin/sh -c " \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
65-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66+
&& PKGOSSCHECKSUM=\"e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6767
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \

‎mainline/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
59+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎mainline/debian-perl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN set -x; \
5353
cd "$tempDir" \
5454
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5555
&& REVISION=${REVISION%~*} \
56-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
57-
&& PKGOSSCHECKSUM="b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${REVISION}.tar.gz" \
56+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
57+
&& PKGOSSCHECKSUM="e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443 *${REVISION}.tar.gz" \
5858
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5959
echo "pkg-oss tarball checksum verification succeeded!"; \
6060
else \

‎mainline/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ RUN set -x \
8080
cd "$tempDir" \
8181
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
8282
&& REVISION=${REVISION%~*} \
83-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
84-
&& PKGOSSCHECKSUM="b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907 *${REVISION}.tar.gz" \
83+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
84+
&& PKGOSSCHECKSUM="e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
else \

‎stable/alpine-perl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ RUN set -x \
5151
&& su nobody -s /bin/sh -c " \
5252
export HOME=${tempDir} \
5353
&& cd ${tempDir} \
54-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55-
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
54+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
55+
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
5656
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
5757
echo \"pkg-oss tarball checksum verification succeeded!\"; \
5858
else \

‎stable/alpine-slim/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN set -x \
6262
&& su nobody -s /bin/sh -c " \
6363
export HOME=${tempDir} \
6464
&& cd ${tempDir} \
65-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66-
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
65+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
66+
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6767
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6868
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6969
else \

‎stable/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ RUN set -x \
5656
&& su nobody -s /bin/sh -c " \
5757
export HOME=${tempDir} \
5858
&& cd ${tempDir} \
59-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60-
&& PKGOSSCHECKSUM=\"825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
59+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
60+
&& PKGOSSCHECKSUM=\"b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6161
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6262
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6363
else \

‎stable/debian-perl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN set -x; \
5353
cd "$tempDir" \
5454
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
5555
&& REVISION=${REVISION%~*} \
56-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
57-
&& PKGOSSCHECKSUM="825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${REVISION}.tar.gz" \
56+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
57+
&& PKGOSSCHECKSUM="b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${REVISION}.tar.gz" \
5858
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
5959
echo "pkg-oss tarball checksum verification succeeded!"; \
6060
else \

‎stable/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ RUN set -x \
8080
cd "$tempDir" \
8181
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
8282
&& REVISION=${REVISION%~*} \
83-
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${REVISION}.tar.gz \
84-
&& PKGOSSCHECKSUM="825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a *${REVISION}.tar.gz" \
83+
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
84+
&& PKGOSSCHECKSUM="b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764 *${REVISION}.tar.gz" \
8585
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
8686
echo "pkg-oss tarball checksum verification succeeded!"; \
8787
else \

‎update.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ declare -A alpine=(
5454
)
5555

5656
# When we bump njs version in a stable release we don't move the tag in the
57-
# mercurial repo. This setting allows us to specify a revision to check out
58-
# when building alpine packages on architectures not supported by nginx.org
57+
# pkg-oss repo. This setting allows us to specify a revision to check out
58+
# when building packages on architectures not supported by nginx.org
5959
# Remember to update pkgosschecksum when changing this.
6060
declare -A rev=(
6161
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
@@ -64,10 +64,10 @@ declare -A rev=(
6464

6565
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
6666
# revision/tag in the previous block
67-
# Used in alpine builds for architectures not packaged by nginx.org
67+
# Used in builds for architectures not packaged by nginx.org
6868
declare -A pkgosschecksum=(
69-
[mainline]='b9fbdf1779186fc02aa59dd87597fe4e906892391614289a4e6eedba398a3e770347b5b07110cca8c11fa3ba85bb711626ae69832e74c69ca8340d040a465907'
70-
[stable]='825f610c44dfb97166112e6d060c0ba209a74f50e42c7c23a5b8742f468596f110bb1b4ca9299547a8a3d41f3a7caa864622f40f6c7bb4d8bab3d24880bdfb6a'
69+
[mainline]='e1a8e980d904df21484fc09793f1c938d566dcf0e752171714e70fc364dcd54b1bf3ce3e2ec90747114c5b24ac8050f1e8c6a774ff4476508d5dc99666e59443'
70+
[stable]='b5d8ad59567a5df18f134236c4e22a339229cd56f4b2ae8d1b77a17f3dcfb16672103bd9191d419acf93c90e866b59417aad26ad7710d9dcc53bf38d1f88d764'
7171
)
7272

7373
get_packages() {

0 commit comments

Comments
 (0)