Merge pull request #3907 from aledbf/fix-size

Remove unnecessary copy of GeoIP databases
2019-03-21 10:37:38 -07:00 · 2019-03-21 10:37:38 -07:00 · d3b9795797
commit d3b9795797
parent 68693a019c 6d0f3a00c7
5 changed files with 1 additions and 5 deletions
--- a/images/nginx/Makefile
+++ b/images/nginx/Makefile
@ -13,7 +13,7 @@
 # limitations under the License.

 # 0.0.0 shouldn't clobber any released builds
-TAG ?= 0.81
+TAG ?= 0.82
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 DOCKER ?= docker
--- a/images/nginx/rootfs/build.sh
+++ b/images/nginx/rootfs/build.sh
@ -611,10 +611,6 @@ rm -rf /etc/nginx/owasp-modsecurity-crs/util/regression-tests

 rm -rf $HOME/.hunter

-# move geoip directory
-mv /geoip/* /etc/nginx/geoip
-rm -rf /geoip
-
 # update image permissions
 writeDirs=( \
  /etc/nginx \
--- a/images/nginx/rootfs/etc/nginx/geoip/GeoIP.dat
+++ b/images/nginx/rootfs/etc/nginx/geoip/GeoIP.dat
--- a/images/nginx/rootfs/etc/nginx/geoip/GeoIPASNum.dat
+++ b/images/nginx/rootfs/etc/nginx/geoip/GeoIPASNum.dat
--- a/images/nginx/rootfs/etc/nginx/geoip/GeoLiteCity.dat
+++ b/images/nginx/rootfs/etc/nginx/geoip/GeoLiteCity.dat