diff --git a/balancer/experemental/.docker-repository.yml b/balancer/experemental/.docker-repository.yml new file mode 100644 index 000000000..6bf9e2675 --- /dev/null +++ b/balancer/experemental/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/balancer diff --git a/balancer/experemental/.dockerignore b/balancer/experemental/.dockerignore new file mode 100644 index 000000000..f5523d40c --- /dev/null +++ b/balancer/experemental/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea diff --git a/balancer/experemental/Dockerfile b/balancer/experemental/Dockerfile new file mode 100644 index 000000000..6e6c36119 --- /dev/null +++ b/balancer/experemental/Dockerfile @@ -0,0 +1,17 @@ +FROM epicmorg/devel +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ADD pre/ngninx.pre.tar.gz / + + + +#FROM epicmorg/prod +#LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +#ARG DEBIAN_FRONTEND=noninteractive + +#final config +#VOLUME ["/var/cache/nginx"] +#EXPOSE 80 443 + +#CMD ["nginx", "-g", "daemon off;"] diff --git a/balancer/experemental/Makefile b/balancer/experemental/Makefile new file mode 100644 index 000000000..b6b5573be --- /dev/null +++ b/balancer/experemental/Makefile @@ -0,0 +1,4 @@ +all: nginx + +nginx: + docker build --compress -t epicmorg/balancer:testing . diff --git a/balancer/experemental/README.md b/balancer/experemental/README.md new file mode 100644 index 000000000..034784bc0 --- /dev/null +++ b/balancer/experemental/README.md @@ -0,0 +1,30 @@ +# Compose example + +```yml +version: '3.7' +services: + balancer: + image: epicmorg/balancer + restart: unless-stopped + ports: + - "0.0.0.0:80:80" + - "0.0.0.0:443:443" + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone + - /etc/letsencrypt:/etc/letsencrypt + - nginx:/etc/nginx + - nginx-usr:/usr/share/nginx/html + - /var/lib/nginx +# extra_hosts: +# - "example.com:192.168.0.11" + depends_on: + - websites + tmpfs: + - /tmp +volumes: + nginx: + external: true + nginx-usr: + external: true +``` diff --git a/balancer/experemental/pre/luajit2-description-pak b/balancer/experemental/pre/luajit2-description-pak new file mode 100644 index 000000000..4305e8e88 --- /dev/null +++ b/balancer/experemental/pre/luajit2-description-pak @@ -0,0 +1 @@ +Custom build of luajit2 for Nginx module, by EpicMorg. diff --git a/balancer/experemental/pre/nginx-description-pak b/balancer/experemental/pre/nginx-description-pak new file mode 100644 index 000000000..b6c186ed8 --- /dev/null +++ b/balancer/experemental/pre/nginx-description-pak @@ -0,0 +1 @@ +Custom build of Nginx with some modules by EpicMorg. \ No newline at end of file diff --git a/balancer/experemental/pre/ngninx.pre.tar.gz b/balancer/experemental/pre/ngninx.pre.tar.gz new file mode 100644 index 000000000..d61ff23b2 Binary files /dev/null and b/balancer/experemental/pre/ngninx.pre.tar.gz differ diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/Dockerfile index 89eb78fe3..82a548011 100644 --- a/epicmorg/devel/Dockerfile +++ b/epicmorg/devel/Dockerfile @@ -62,10 +62,49 @@ RUN apt-get update && \ checkinstall \ dh-make +################################################################## +# IP2Location support +################################################################## +RUN cd /tmp && \ + git clone https://github.com/chrislim2888/IP2Location-C-Library.git ip2 && \ + cd /tmp/ip2 && \ + ./build.sh && \ + checkinstall --pkgversion=$(date +%Y%m%d%H%M) && \ + rm -rfv /tmp/ip2 + ################################################################## # nginx deps ################################################################## - +RUN apt-get update && \ + apt install -y --allow-unauthenticated \ + zlibc \ + zlib1g \ + zlib1g-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libgd-dev \ + libpcre3-dev \ + libgeoip-dev \ + libkrb5-dev \ + libperl-dev \ + krb5-user \ + samba \ + luajit \ + liblua5.1-0-dev \ + libmaxminddb-dev \ + libpam0g-dev \ + libldap2-dev \ + libavformat-dev \ + libavfilter-dev \ + libswscale-dev \ + libavcodec-dev \ + libz-dev \ + libhiredis-dev \ + libzip-dev \ + libcrypto++-dev \ + libbz2-dev \ + tcl ################################################################## # other customisations