From 6d0f3a00c734642be1be795d355e8d023120b222 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 19 Mar 2019 09:36:30 -0300
Subject: [PATCH] Remove unnecessary copy of GeoIP databases

---
 images/nginx/Makefile                               |   2 +-
 images/nginx/rootfs/build.sh                        |   4 ----
 images/nginx/rootfs/{ => etc/nginx}/geoip/GeoIP.dat | Bin
 .../rootfs/{ => etc/nginx}/geoip/GeoIPASNum.dat     | Bin
 .../rootfs/{ => etc/nginx}/geoip/GeoLiteCity.dat    | Bin
 5 files changed, 1 insertion(+), 5 deletions(-)
 rename images/nginx/rootfs/{ => etc/nginx}/geoip/GeoIP.dat (100%)
 rename images/nginx/rootfs/{ => etc/nginx}/geoip/GeoIPASNum.dat (100%)
 rename images/nginx/rootfs/{ => etc/nginx}/geoip/GeoLiteCity.dat (100%)

diff --git a/images/nginx/Makefile b/images/nginx/Makefile
index 4561c80bd..bc7391199 100644
--- 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
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
index e8bbc2fb7..e91ef13fb 100755
--- 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 \
diff --git a/images/nginx/rootfs/geoip/GeoIP.dat b/images/nginx/rootfs/etc/nginx/geoip/GeoIP.dat
similarity index 100%
rename from images/nginx/rootfs/geoip/GeoIP.dat
rename to images/nginx/rootfs/etc/nginx/geoip/GeoIP.dat
diff --git a/images/nginx/rootfs/geoip/GeoIPASNum.dat b/images/nginx/rootfs/etc/nginx/geoip/GeoIPASNum.dat
similarity index 100%
rename from images/nginx/rootfs/geoip/GeoIPASNum.dat
rename to images/nginx/rootfs/etc/nginx/geoip/GeoIPASNum.dat
diff --git a/images/nginx/rootfs/geoip/GeoLiteCity.dat b/images/nginx/rootfs/etc/nginx/geoip/GeoLiteCity.dat
similarity index 100%
rename from images/nginx/rootfs/geoip/GeoLiteCity.dat
rename to images/nginx/rootfs/etc/nginx/geoip/GeoLiteCity.dat