Skip to content

Commit 7ac1672

Browse files
committed
remove unused arg/labels
1 parent 97f7b94 commit 7ac1672

File tree

1 file changed

+2
-48
lines changed

1 file changed

+2
-48
lines changed

dockerfiles/Dockerfile.apisix-openresty.apk

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,67 +7,21 @@ COPY ./utils/build-common.sh /tmp/build-common.sh
77
COPY build-apisix-openresty.sh /tmp/build-apisix-openresty.sh
88
COPY ./utils/determine-dist.sh /tmp/determine-dist.sh
99

10-
ARG RESTY_VERSION="1.19.3.1"
10+
1111
ARG RESTY_OPENSSL_VERSION="1.1.1g"
1212
ARG RESTY_OPENSSL_PATCH_VERSION="1.1.1f"
1313
ARG RESTY_OPENSSL_URL_BASE="https://www.openssl.org/source"
1414
ARG RESTY_PCRE_VERSION="8.44"
1515
ARG RESTY_J="1"
16-
ARG RESTY_CONFIG_OPTIONS="\
17-
--with-compat \
18-
--with-file-aio \
19-
--with-http_addition_module \
20-
--with-http_auth_request_module \
21-
--with-http_dav_module \
22-
--with-http_flv_module \
23-
--with-http_geoip_module=dynamic \
24-
--with-http_gunzip_module \
25-
--with-http_gzip_static_module \
26-
--with-http_image_filter_module=dynamic \
27-
--with-http_mp4_module \
28-
--with-http_random_index_module \
29-
--with-http_realip_module \
30-
--with-http_secure_link_module \
31-
--with-http_slice_module \
32-
--with-http_ssl_module \
33-
--with-http_stub_status_module \
34-
--with-http_sub_module \
35-
--with-http_v2_module \
36-
--with-http_xslt_module=dynamic \
37-
--with-ipv6 \
38-
--with-mail \
39-
--with-mail_ssl_module \
40-
--with-md5-asm \
41-
--with-pcre-jit \
42-
--with-sha1-asm \
43-
--with-stream \
44-
--with-stream_ssl_module \
45-
--with-threads \
46-
"
47-
ARG RESTY_CONFIG_OPTIONS_MORE=""
48-
ARG RESTY_LUAJIT_OPTIONS="--with-luajit-xcflags='-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT'"
49-
5016
ARG RESTY_EVAL_PRE_CONFIGURE=""
51-
ARG RESTY_EVAL_POST_MAKE=""
52-
53-
# These are not intended to be user-specified
54-
ARG _RESTY_CONFIG_DEPS="--with-pcre \
55-
--with-cc-opt='-DNGX_LUA_ABORT_AT_PANIC -I/usr/local/openresty/pcre/include -I/usr/local/openresty/openssl111/include' \
56-
--with-ld-opt='-L/usr/local/openresty/pcre/lib -L/usr/local/openresty/openssl111/lib -Wl,-rpath,/usr/local/openresty/pcre/lib:/usr/local/openresty/openssl111/lib' \
57-
"
5817

5918
LABEL resty_image_base="${RESTY_IMAGE_BASE}"
6019
LABEL resty_image_tag="${IMAGE_TAG}"
61-
LABEL resty_version="${RESTY_VERSION}"
6220
LABEL resty_openssl_version="${RESTY_OPENSSL_VERSION}"
6321
LABEL resty_openssl_patch_version="${RESTY_OPENSSL_PATCH_VERSION}"
6422
LABEL resty_openssl_url_base="${RESTY_OPENSSL_URL_BASE}"
6523
LABEL resty_pcre_version="${RESTY_PCRE_VERSION}"
66-
LABEL resty_config_options="${RESTY_CONFIG_OPTIONS}"
67-
LABEL resty_config_options_more="${RESTY_CONFIG_OPTIONS_MORE}"
68-
LABEL resty_config_deps="${_RESTY_CONFIG_DEPS}"
6924
LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
70-
LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"
7125

7226

7327
RUN apk add --no-cache --virtual .build-deps \
@@ -127,4 +81,4 @@ RUN cd /tmp \
12781
&& curl --version \
12882
&& ./build-common.sh build_apisix_openresty_apk
12983

130-
CMD /bin/sh
84+
CMD /bin/sh

0 commit comments

Comments
 (0)