From c7969435a7d0b92fd932d196e8e00b892db7b843 Mon Sep 17 00:00:00 2001 From: Mr Bot Date: Mon, 23 Sep 2019 14:55:02 +0300 Subject: [PATCH] nginx testing --- balancer/experemental/.docker-repository.yml | 1 + balancer/experemental/.dockerignore | 3 ++ balancer/experemental/Dockerfile | 17 ++++++++ balancer/experemental/Makefile | 4 ++ balancer/experemental/README.md | 30 +++++++++++++ .../experemental/pre/luajit2-description-pak | 1 + .../experemental/pre/nginx-description-pak | 1 + balancer/experemental/pre/ngninx.pre.tar.gz | Bin 0 -> 9523 bytes epicmorg/devel/Dockerfile | 41 +++++++++++++++++- 9 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 balancer/experemental/.docker-repository.yml create mode 100644 balancer/experemental/.dockerignore create mode 100644 balancer/experemental/Dockerfile create mode 100644 balancer/experemental/Makefile create mode 100644 balancer/experemental/README.md create mode 100644 balancer/experemental/pre/luajit2-description-pak create mode 100644 balancer/experemental/pre/nginx-description-pak create mode 100644 balancer/experemental/pre/ngninx.pre.tar.gz 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 0000000000000000000000000000000000000000..d61ff23b206320f692cc8826d30d31f24603af0c GIT binary patch literal 9523 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 E16HQ!wEzGB literal 0 HcmV?d00001 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