From e6f0218cdb47ef853de16cb349f9737c6b3326f9 Mon Sep 17 00:00:00 2001
From: Odmin <admin@epicm.org>
Date: Sun, 2 Feb 2020 03:55:09 +0300
Subject: [PATCH] February patch-1

---
 CHANGELOG.md                                  |  4 ++++
 balancer/latest/Dockerfile                    | 19 ++++++++++++++++++-
 .../latest/pre/ip2location-description-pak    |  1 +
 epicmorg/devel/main/Dockerfile                |  9 ---------
 websites/latest/Dockerfile                    |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 balancer/latest/pre/ip2location-description-pak

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0ae22007..91da37311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+* `February 2020`
+	* `fixed` all `*.sh` chmods. (sorry)
+	* fixed `balancer` final container with `edge`.
+	* `websites` migrated to `edge`. why not?
 * `January 2020` (01/13/2020 - 01/30/2020)
     * separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11` 
 	* teamcity -  `devel:jdk11`
diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile
index f2b380d71..3c94a4758 100644
--- a/balancer/latest/Dockerfile
+++ b/balancer/latest/Dockerfile
@@ -23,6 +23,23 @@ ARG LUAJIT_LIB=/usr/local/lib
 RUN mkdir -p ${PRE_DIR}  ${NGINX_SRC_DIR} /usr/lib/nginx
 ADD pre/luajit2-description-pak ${PRE_DIR}
 ADD pre/nginx-description-pak ${PRE_DIR}
+ADD pre/ip2location-description-pak ${PRE_DIR}
+
+
+##################################################################
+#                   IP2Location support for prod nginx module
+##################################################################
+RUN cd ${SRC_DIR} && \
+    git clone https://github.com/chrislim2888/IP2Location-C-Library.git ip2 && \
+    cp -fv ${PRE_DIR}/ip2location-description-pak ${SRC_DIR}/ip2/description-pak && \
+    cd ${SRC_DIR}/ip2 && \
+    ./build.sh && \
+    fakeroot checkinstall -D --pakdir=${EXPORT_DIR} --maintainer="EpicMorg, developer@epicm.org" --pkgname=ip2-custom  --conflicts=ip2 --install=yes -y  && \
+    ln -s /usr/local/lib/libIP2Location.so /usr/lib/libIP2Location.so && \
+    ln -s /usr/local/lib/libIP2Location.so.1 /usr/lib/libIP2Location.so.1 && \
+    ln -s /usr/local/lib/libIP2Location.so /lib/libIP2Location.so && \
+    ln -s /usr/local/lib/libIP2Location.so.1 /lib/libIP2Location.so.1 && \
+    dpkg --force-all -i ${EXPORT_DIR}/*.deb
 
 ##################################################################
 #                   luaJIT 2 support for prod nginx module
@@ -156,7 +173,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/balancer/latest/pre/ip2location-description-pak b/balancer/latest/pre/ip2location-description-pak
new file mode 100644
index 000000000..e93eb7783
--- /dev/null
+++ b/balancer/latest/pre/ip2location-description-pak
@@ -0,0 +1 @@
+Custom build of ip2location lib by EpicMorg.
diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile
index 0e3ae6c13..876692b7c 100644
--- a/epicmorg/devel/main/Dockerfile
+++ b/epicmorg/devel/main/Dockerfile
@@ -82,15 +82,6 @@ RUN apt-get update && \
     libvpx6 \
     tcl
 
-##################################################################
-#                   IP2Location support for prod nginx module
-##################################################################
-RUN cd ${SRC_DIR} && \
-    git clone https://github.com/chrislim2888/IP2Location-C-Library.git ip2 && \
-    cd ${SRC_DIR}/ip2 && \
-    ./build.sh && \
-    fakeroot checkinstall -D --pkgversion=$(date +%Y%m%d%H%M) --pakdir=${EXPORT_DIR} --maintainer="EpicMorg, developer@epicm.org" --pkgname=ip2-custom  --conflicts=ip2 --install=yes -y && \
-    rm -rfv ${SRC_DIR}/*
 
 ##################################################################
 #                   other   customisations
diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile
index 5259091cd..cb0c8a007 100644
--- a/websites/latest/Dockerfile
+++ b/websites/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive