Compare commits
2 Commits
0e515abaec
...
0338c7fffe
Author | SHA1 | Date | |
---|---|---|---|
0338c7fffe
|
|||
affe19378b
|
@@ -54,7 +54,6 @@ RUN apt-env.sh apt-get update ; \
|
|||||||
jdupes \
|
jdupes \
|
||||||
jq \
|
jq \
|
||||||
libcap2-bin \
|
libcap2-bin \
|
||||||
libjemalloc2 \
|
|
||||||
logrotate \
|
logrotate \
|
||||||
netbase \
|
netbase \
|
||||||
netcat-openbsd \
|
netcat-openbsd \
|
||||||
|
@@ -5,6 +5,9 @@ set -ef
|
|||||||
|
|
||||||
## hack: override "cache", "lib" and "log" from /angie (and possibly from /etc/angie)
|
## hack: override "cache", "lib" and "log" from /angie (and possibly from /etc/angie)
|
||||||
fake_dir=$(mktemp -d)
|
fake_dir=$(mktemp -d)
|
||||||
|
if [ "${NGX_HTTP_STATIC_MERGE}" = 0 ] ; then
|
||||||
|
persist_dirs="${persist_dirs} static"
|
||||||
|
fi
|
||||||
for n in ${persist_dirs} ; do touch "${fake_dir}/$n" ; done
|
for n in ${persist_dirs} ; do touch "${fake_dir}/$n" ; done
|
||||||
|
|
||||||
install -d "${target_root}"
|
install -d "${target_root}"
|
||||||
@@ -18,7 +21,6 @@ if [ "${NGX_HTTP_STATIC_MERGE}" = 0 ] ; then
|
|||||||
src0=/etc/angie.dist/static
|
src0=/etc/angie.dist/static
|
||||||
dst="${target_root}/static"
|
dst="${target_root}/static"
|
||||||
|
|
||||||
rm -rf "${dst}"
|
|
||||||
for r in /angie /etc/angie ; do
|
for r in /angie /etc/angie ; do
|
||||||
src="$r/static"
|
src="$r/static"
|
||||||
[ -d "${src}" ] || continue
|
[ -d "${src}" ] || continue
|
||||||
@@ -29,6 +31,7 @@ if [ "${NGX_HTTP_STATIC_MERGE}" = 0 ] ; then
|
|||||||
|
|
||||||
install -d "${dst}"
|
install -d "${dst}"
|
||||||
overlaydirs --merge "${dst}" ${src0} "${src}"
|
overlaydirs --merge "${dst}" ${src0} "${src}"
|
||||||
|
break
|
||||||
done
|
done
|
||||||
[ -d "${dst}" ] || {
|
[ -d "${dst}" ] || {
|
||||||
log_always "static directory is almost empty!"
|
log_always "static directory is almost empty!"
|
||||||
|
@@ -25,11 +25,6 @@ iep_preserve_env() {
|
|||||||
unset __IEP_MALLOC_ARENA_MAX
|
unset __IEP_MALLOC_ARENA_MAX
|
||||||
__IEP_MALLOC_ARENA_MAX="${MALLOC_ARENA_MAX:-4}"
|
__IEP_MALLOC_ARENA_MAX="${MALLOC_ARENA_MAX:-4}"
|
||||||
export MALLOC_ARENA_MAX=2
|
export MALLOC_ARENA_MAX=2
|
||||||
|
|
||||||
## jemalloc: preserve MALLOC_CONF
|
|
||||||
unset __IEP_MALLOC_CONF
|
|
||||||
__IEP_MALLOC_CONF="${MALLOC_CONF:-}"
|
|
||||||
unset MALLOC_CONF
|
|
||||||
}
|
}
|
||||||
|
|
||||||
iep_restore_env() {
|
iep_restore_env() {
|
||||||
@@ -52,12 +47,6 @@ iep_restore_env() {
|
|||||||
export MALLOC_ARENA_MAX="${__IEP_MALLOC_ARENA_MAX}"
|
export MALLOC_ARENA_MAX="${__IEP_MALLOC_ARENA_MAX}"
|
||||||
fi
|
fi
|
||||||
unset __IEP_MALLOC_ARENA_MAX
|
unset __IEP_MALLOC_ARENA_MAX
|
||||||
|
|
||||||
## jemalloc: restore MALLOC_CONF
|
|
||||||
if [ -n "${__IEP_MALLOC_CONF:-}" ] ; then
|
|
||||||
export MALLOC_CONF="${__IEP_MALLOC_CONF}"
|
|
||||||
fi
|
|
||||||
unset __IEP_MALLOC_CONF
|
|
||||||
}
|
}
|
||||||
|
|
||||||
iep_flush_volume() {
|
iep_flush_volume() {
|
||||||
|
@@ -34,8 +34,6 @@ J2CFG_PRESERVE_ENVS = [
|
|||||||
# glibc
|
# glibc
|
||||||
'GLIBC_TUNABLES',
|
'GLIBC_TUNABLES',
|
||||||
'MALLOC_ARENA_MAX',
|
'MALLOC_ARENA_MAX',
|
||||||
# jemalloc
|
|
||||||
'MALLOC_CONF',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
J2CFG_PASSTHROUGH_ENVS = [
|
J2CFG_PASSTHROUGH_ENVS = [
|
||||||
|
Reference in New Issue
Block a user