Skip to content

Commit 0055ba3

Browse files
Remove legacy GeoIP from image (#10500)
Signed-off-by: Jintao Zhang <[email protected]> Co-authored-by: Ricardo Katz <[email protected]>
1 parent 9db8fe5 commit 0055ba3

File tree

5 files changed

+3
-6
lines changed

5 files changed

+3
-6
lines changed

images/nginx/rootfs/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN apk update \
3939
openssl \
4040
pcre \
4141
zlib \
42-
geoip \
4342
ca-certificates \
4443
patch \
4544
yajl \

images/nginx/rootfs/build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export LUA_UPSTREAM_VERSION=8aa93ead98ba2060d4efd594ae33a35d153589bf
7777
# Check for recent changes: https://github.com/openresty/lua-cjson/compare/2.1.0.11...openresty:master
7878
export LUA_CJSON_VERSION=2.1.0.11
7979

80-
# Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/3.3...master
81-
export GEOIP2_VERSION=a26c6beed77e81553686852dceb6c7fdacc5970d
80+
# Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/3.4...master
81+
export GEOIP2_VERSION=a607a41a8115fecfc05b5c283c81532a3d605425
8282

8383
# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20230410...v2.1-agentzh
8484
export LUAJIT_VERSION=2.1-20230410
@@ -164,7 +164,6 @@ apk add \
164164
linux-headers \
165165
libxslt-dev \
166166
gd-dev \
167-
geoip-dev \
168167
perl-dev \
169168
libedit-dev \
170169
mercurial \
@@ -263,7 +262,7 @@ fi
263262
get_src 8d39c6b23f941a2d11571daaccc04e69539a3fcbcc50a631837560d5861a7b96 \
264263
"https://github.com/DataDog/dd-opentracing-cpp/archive/v$DATADOG_CPP_VERSION.tar.gz"
265264

266-
get_src 4c1933434572226942c65b2f2b26c8a536ab76aa771a3c7f6c2629faa764976b \
265+
get_src b6c9c09fd43eb34a71e706ad780b2ead26549a9a9f59280fe558f5b7b980b7c6 \
267266
"https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_VERSION.tar.gz"
268267

269268
get_src deb4ab1ffb9f3d962c4b4a2c4bdff692b86a209e3835ae71ebdf3b97189e40a9 \
@@ -583,7 +582,6 @@ WITH_FLAGS="--with-debug \
583582
--with-http_realip_module \
584583
--with-http_auth_request_module \
585584
--with-http_addition_module \
586-
--with-http_geoip_module \
587585
--with-http_gzip_static_module \
588586
--with-http_sub_module \
589587
--with-http_v2_module \
-1.19 MB
Binary file not shown.
-4.42 MB
Binary file not shown.
-19.6 MB
Binary file not shown.

0 commit comments

Comments
 (0)