diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/Dockerfile index 5194cc757..d6d634ea4 100644 --- a/epicmorg/devel/Dockerfile +++ b/epicmorg/devel/Dockerfile @@ -75,16 +75,6 @@ RUN apt-get update && \ checkinstall \ dh-make -################################################################## -# 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}/* - ################################################################## # nginx deps ################################################################## @@ -119,6 +109,16 @@ RUN apt-get update && \ libbz2-dev \ 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/epicmorg/devel/sources.list b/epicmorg/devel/sources.list index f68841344..d45b71bfb 100644 --- a/epicmorg/devel/sources.list +++ b/epicmorg/devel/sources.list @@ -1,6 +1,6 @@ #main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free +deb http://ftp.ru.debian.org/debian/ testing main contrib non-free +deb-src http://ftp.ru.debian.org/debian/ testing main contrib non-free deb http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free deb-src http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free deb http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free diff --git a/epicmorg/prod/Dockerfile b/epicmorg/prod/Dockerfile index 63be736ba..8e84f4065 100644 --- a/epicmorg/prod/Dockerfile +++ b/epicmorg/prod/Dockerfile @@ -33,6 +33,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio htop \ iftop \ iputils-ping \ + kmod \ libzip4 \ locales \ lsb-release \