Skip to content

Commit ef2857a

Browse files
soultearysoulteary
committed
update repo
1 parent 6b261f4 commit ef2857a

File tree

6 files changed

+149
-1
lines changed

6 files changed

+149
-1
lines changed

‎README.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,25 @@
11
# ngx_http_array_var_module
2-
ngx_http_array_var_module
2+
3+
- Official: https://github.com/openresty/array-var-nginx-module
4+
- Build: https://github.com/nginx-with-docker/array-var-nginx-module-src
5+
## Nginx Images
6+
7+
<table>
8+
<thead>
9+
<tr>
10+
<th>Nginx Version</th>
11+
<th>Module Version</th>
12+
<th>Docker Images</th>
13+
</tr>
14+
</thead>
15+
<tbody>
16+
<tr>
17+
<td>1.21.0</td>
18+
<td>0.05</td>
19+
<td><ul>
20+
<li>docker pull soulteary/prebuilt-nginx-modules:ngx-1.21.0-array-var-0.05</li>
21+
<li>docker pull soulteary/prebuilt-nginx-modules:ngx-1.21.0-array-var-0.05-alpine</li>
22+
</ul></td>
23+
</tr>
24+
</tbody>
25+
</table>

‎docker/.env‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
NGINX_VERSION=1.21.0
2+
MODULE_CHECKSUM=ddee1dc35af1d396ba17b86da1758338a509b3ec
3+
MODULE_VERSION=0.05
4+
MODULE_NAME=array-var-nginx-module-src
5+
MODULE_SOURCE=https://github.com/nginx-with-docker/array-var-nginx-module-src
6+
DEVEL_KIT_MODULE_CHECKSUM=e15316e13a7b19a3d2502becbb26043a464a135a
7+
DEVEL_KIT_VERSION=0.3.1
8+
DEVEL_KIT_NAME=ngx_devel_kit

‎docker/Dockerfile.alpine‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
ARG NGINX_VERSION=1.21.0
2+
FROM soulteary/prebuilt-nginx-modules:base-${NGINX_VERSION}-alpine AS Builder
3+
4+
ARG MODULE_CHECKSUM=ddee1dc35af1d396ba17b86da1758338a509b3ec
5+
ARG MODULE_VERSION=0.05
6+
ARG MODULE_NAME=array-var-nginx-module-src
7+
ARG MODULE_SOURCE=https://github.com/nginx-with-docker/array-var-nginx-module-src
8+
9+
ARG DEVEL_KIT_MODULE_CHECKSUM=e15316e13a7b19a3d2502becbb26043a464a135a
10+
ARG DEVEL_KIT_VERSION=0.3.1
11+
ARG DEVEL_KIT_NAME=ngx_devel_kit
12+
13+
RUN cd /usr/src && \
14+
curl -L "${MODULE_SOURCE}/archive/v${MODULE_VERSION}.tar.gz" -o "v${MODULE_VERSION}.tar.gz" && \
15+
echo "${MODULE_CHECKSUM} v${MODULE_VERSION}.tar.gz" | shasum -c && \
16+
curl -L "https://github.com/vision5/ngx_devel_kit/archive/v${DEVEL_KIT_VERSION}.tar.gz" -o "v${DEVEL_KIT_VERSION}.tar.gz" && \
17+
echo "${DEVEL_KIT_MODULE_CHECKSUM} v${DEVEL_KIT_VERSION}.tar.gz" | shasum -c && \
18+
tar -zxC /usr/src -f v${MODULE_VERSION}.tar.gz && \
19+
tar -zxC /usr/src -f v${DEVEL_KIT_VERSION}.tar.gz && \
20+
cd /usr/src && \
21+
mv ${MODULE_NAME}-${MODULE_VERSION}/ ${MODULE_NAME} && \
22+
mv ${DEVEL_KIT_NAME}-${DEVEL_KIT_VERSION}/ ${DEVEL_KIT_NAME} && \
23+
cd /usr/src/nginx && \
24+
CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p') \
25+
CONFARGS=${CONFARGS/-Os -fomit-frame-pointer -g/-Os} && \
26+
echo $CONFARGS && \
27+
./configure --with-compat $CONFARGS --add-dynamic-module=../${DEVEL_KIT_NAME}/ --add-dynamic-module=../${MODULE_NAME}/ && \
28+
make modules
29+
30+
FROM scratch
31+
32+
COPY --from=Builder /usr/src/nginx/objs/ndk_http_module.so /
33+
COPY --from=Builder /usr/src/nginx/objs/ngx_http_array_var_module.so /

‎docker/Dockerfile.debian‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
ARG NGINX_VERSION=1.21.0
2+
FROM soulteary/prebuilt-nginx-modules:base-${NGINX_VERSION} AS Builder
3+
4+
ARG MODULE_CHECKSUM=ddee1dc35af1d396ba17b86da1758338a509b3ec
5+
ARG MODULE_VERSION=0.05
6+
ARG MODULE_NAME=array-var-nginx-module-src
7+
ARG MODULE_SOURCE=https://github.com/nginx-with-docker/array-var-nginx-module-src
8+
9+
ARG DEVEL_KIT_MODULE_CHECKSUM=e15316e13a7b19a3d2502becbb26043a464a135a
10+
ARG DEVEL_KIT_VERSION=0.3.1
11+
ARG DEVEL_KIT_NAME=ngx_devel_kit
12+
13+
RUN cd /usr/src && \
14+
curl -L "${MODULE_SOURCE}/archive/v${MODULE_VERSION}.tar.gz" -o "v${MODULE_VERSION}.tar.gz" && \
15+
echo "${MODULE_CHECKSUM} v${MODULE_VERSION}.tar.gz" | shasum -c && \
16+
curl -L "https://github.com/vision5/ngx_devel_kit/archive/v${DEVEL_KIT_VERSION}.tar.gz" -o "v${DEVEL_KIT_VERSION}.tar.gz" && \
17+
echo "${DEVEL_KIT_MODULE_CHECKSUM} v${DEVEL_KIT_VERSION}.tar.gz" | shasum -c && \
18+
tar -zxC /usr/src -f v${MODULE_VERSION}.tar.gz && \
19+
tar -zxC /usr/src -f v${DEVEL_KIT_VERSION}.tar.gz && \
20+
cd /usr/src && \
21+
mv ${MODULE_NAME}-${MODULE_VERSION}/ ${MODULE_NAME} && \
22+
mv ${DEVEL_KIT_NAME}-${DEVEL_KIT_VERSION}/ ${DEVEL_KIT_NAME} && \
23+
cd /usr/src/nginx && \
24+
echo $CONFARGS && \
25+
./configure --with-compat $CONFARGS --add-dynamic-module=../${DEVEL_KIT_NAME}/ --add-dynamic-module=../${MODULE_NAME}/ && \
26+
make modules
27+
28+
FROM scratch
29+
30+
COPY --from=Builder /usr/src/nginx/objs/ndk_http_module.so /
31+
COPY --from=Builder /usr/src/nginx/objs/ngx_http_array_var_module.so /

‎make-image.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
3+
set -a
4+
. "docker/.env"
5+
set +a
6+
7+
PROJECT_NAME="array-var"
8+
REPO_NAME="soulteary/prebuilt-nginx-modules";
9+
REPO_TAG="ngx-$NGINX_VERSION-$PROJECT_NAME-$MODULE_VERSION";
10+
11+
BUILD_ARGS=$(tr '\n' ';' < "docker/.env" | sed 's/;$/\n/' | sed 's/^/ --build-arg /' | sed 's/;/ --build-arg /g')
12+
13+
if [ -f "docker/Dockerfile.alpine" ]; then
14+
BUILD_NAME="$REPO_NAME:$REPO_TAG-alpine"
15+
if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" == "" ]]; then
16+
echo "Build: $BUILD_NAME";
17+
docker build $BUILD_ARGS --tag $BUILD_NAME -f docker/Dockerfile.alpine .
18+
fi
19+
fi
20+
21+
if [ -f "docker/Dockerfile.debian" ]; then
22+
BUILD_NAME="$REPO_NAME:$REPO_TAG"
23+
if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" == "" ]]; then
24+
echo "Build: $BUILD_NAME";
25+
docker build $BUILD_ARGS --tag $BUILD_NAME -f docker/Dockerfile.debian .
26+
fi
27+
fi

‎push-image.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
set -a
4+
. "docker/.env"
5+
set +a
6+
7+
PROJECT_NAME="array-var"
8+
REPO_NAME="soulteary/prebuilt-nginx-modules";
9+
REPO_TAG="ngx-$NGINX_VERSION-$PROJECT_NAME-$MODULE_VERSION";
10+
11+
if [ -f "docker/Dockerfile.alpine" ]; then
12+
BUILD_NAME="$REPO_NAME:$REPO_TAG-alpine"
13+
if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" != "" ]]; then
14+
echo "Push: $BUILD_NAME";
15+
docker push $BUILD_NAME;
16+
fi
17+
fi
18+
19+
if [ -f "docker/Dockerfile.debian" ]; then
20+
BUILD_NAME="$REPO_NAME:$REPO_TAG"
21+
if [[ "$(docker images -q $BUILD_NAME 2> /dev/null)" != "" ]]; then
22+
echo "Push: $BUILD_NAME";
23+
docker push $BUILD_NAME;
24+
fi
25+
fi
26+

0 commit comments

Comments
 (0)