EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2025-01-24 20:48:18 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
STAM 2020-03-06 00:27:00 +03:00
commit 4dad7f77aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
balancer/latest/Dockerfile
View File

@ -2,7 +2,6 @@ FROM epicmorg/devel AS builder
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
################################################################## ##################################################################
# ARGuments # ARGuments
################################################################## ##################################################################
@ -12,7 +11,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src
ARG EXPORT_DIR=${BUILDS_DIR}/export ARG EXPORT_DIR=${BUILDS_DIR}/export
ARG PRE_DIR=${BUILDS_DIR}/pre ARG PRE_DIR=${BUILDS_DIR}/pre
ARG NGINX_SRC_DIR=${SRC_DIR}/nginx ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
ARG NGINX_VERSION=1.17.8 ARG NGINX_VERSION=1.17.9
ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
ARG LUAJIT_INC=/usr/local/include/luajit-2.1 ARG LUAJIT_INC=/usr/local/include/luajit-2.1
ARG LUAJIT_LIB=/usr/local/lib ARG LUAJIT_LIB=/usr/local/lib

1
epicmorg/prod/main/Dockerfile
View File

@ -72,6 +72,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
wget \ wget \
zip && \ zip && \
wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \ wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \
chmod +x /usr/bin/p4 && \
openssl dhparam -out /etc/ssl/dhparam.pem 4096 openssl dhparam -out /etc/ssl/dhparam.pem 4096
################################################################## ##################################################################