DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx image

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-05-30 19:03:56 -04:00
parent efbd0e54e8
commit e3c49c52f4
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/Makefile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
.DEFAULT_GOAL:=container .DEFAULT_GOAL:=image
# set default shell # set default shell
SHELL=/bin/bash -o pipefail SHELL=/bin/bash -o pipefail

4
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM alpine:3.12 as builder FROM alpine:3.11 as builder
COPY . / COPY . /
@ -21,7 +21,7 @@ RUN apk add -U bash \
&& /build.sh && /build.sh
# Use a multi-stage build # Use a multi-stage build
FROM alpine:3.12 FROM alpine:3.11
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

13
images/nginx/rootfs/build.sh
View file

@ -31,8 +31,8 @@ export JAEGER_VERSION=0.4.2
export MSGPACK_VERSION=3.2.1 export MSGPACK_VERSION=3.2.1
export DATADOG_CPP_VERSION=1.1.5 export DATADOG_CPP_VERSION=1.1.5
export MODSECURITY_VERSION=1.0.1 export MODSECURITY_VERSION=1.0.1
export MODSECURITY_LIB_VERSION=6624a18a4e7fd9881a7a9b435db3e481e8e986a5 export MODSECURITY_LIB_VERSION=v3.0.4
export OWASP_MODSECURITY_CRS_VERSION=3.2.0 export OWASP_MODSECURITY_CRS_VERSION=v3.2.0
export LUA_NGX_VERSION=0.10.15 export LUA_NGX_VERSION=0.10.15
export LUA_STREAM_NGX_VERSION=0.0.7 export LUA_STREAM_NGX_VERSION=0.0.7
export LUA_UPSTREAM_VERSION=0.07 export LUA_UPSTREAM_VERSION=0.07
@ -104,7 +104,7 @@ apk add \
curl-dev \ curl-dev \
libprotobuf \ libprotobuf \
git g++ pkgconf flex bison doxygen yajl-dev lmdb-dev libtool autoconf libxml2 libxml2-dev \ git g++ pkgconf flex bison doxygen yajl-dev lmdb-dev libtool autoconf libxml2 libxml2-dev \
python \ python3 \
libmaxminddb-dev \ libmaxminddb-dev \
bc \ bc \
unzip \ unzip \
@ -353,7 +353,7 @@ git submodule init
git submodule update git submodule update
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone https://github.com/ssdeep-project/ssdeep git clone --depth=1 https://github.com/ssdeep-project/ssdeep
cd ssdeep/ cd ssdeep/
./bootstrap ./bootstrap
@ -364,9 +364,8 @@ make install
# build modsecurity library # build modsecurity library
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone https://github.com/SpiderLabs/ModSecurity git clone --depth=1 -b $MODSECURITY_LIB_VERSION https://github.com/SpiderLabs/ModSecurity
cd ModSecurity/ cd ModSecurity/
git checkout $MODSECURITY_LIB_VERSION
git submodule init git submodule init
git submodule update git submodule update
@ -393,7 +392,7 @@ echo "SecAuditLogStorageDir /var/log/audit/" >> /etc/nginx/modsecurity/modsecuri
# Download owasp modsecurity crs # Download owasp modsecurity crs
cd /etc/nginx/ cd /etc/nginx/
git clone -b v$OWASP_MODSECURITY_CRS_VERSION https://github.com/SpiderLabs/owasp-modsecurity-crs git clone -b $OWASP_MODSECURITY_CRS_VERSION https://github.com/SpiderLabs/owasp-modsecurity-crs
cd owasp-modsecurity-crs cd owasp-modsecurity-crs
mv crs-setup.conf.example crs-setup.conf mv crs-setup.conf.example crs-setup.conf