EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-12-24 13:45:32 +03:00
Code Issues Projects Releases Wiki Activity

February patch-1

Browse Source
This commit is contained in:
Odmin 2020-02-02 03:55:09 +03:00
parent ff8dfb8cdd
commit e6f0218cdb
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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`

19
balancer/latest/Dockerfile
View File

@ -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

1
balancer/latest/pre/ip2location-description-pak Normal file
View File

@ -0,0 +1 @@
Custom build of ip2location lib by EpicMorg.

9
epicmorg/devel/main/Dockerfile
View File

@ -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

2
websites/latest/Dockerfile
View File

@ -1,4 +1,4 @@
FROM epicmorg/prod
FROM epicmorg/edge
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive