Skip to content

Commit a6d5da6

Browse files
committed
update system packages, upgrade base image to 1.0.2, added ENV to enable or disable http trace logs
1 parent 1dc4f73 commit a6d5da6

5 files changed

Lines changed: 24 additions & 16 deletions

File tree

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
FROM fabiodcorreia/base-alpine:1.0.1
1+
FROM fabiodcorreia/base-alpine:1.0.2
22

3-
# set version label
43
ARG BUILD_DATE
54
ARG VERSION
65
LABEL build_version="version:- ${VERSION} Build-date:- ${BUILD_DATE}"
@@ -30,7 +29,6 @@ RUN \
3029
/tmp/* \
3130
/var/tmp/*
3231

33-
# add local files
3432
COPY root/ /
3533

3634
# ports

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ The `arch` can be one of the supported architectures described below.
7373
| PUID | Set the UserID - [Details](https://github.com/fabiodcorreia/docker-base-alpine#userid--groupid) |
7474
| PGID | Set the GroupID - [Details](https://github.com/fabiodcorreia/docker-base-alpine#userid--groupid) |
7575
| TZ | Set the system timezone - [Options](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List) |
76+
| HTTP_TRACE | Enable HTTP trace Log (default: false) |

package_versions.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ nghttp2-libs-1.41.0-r0
2828
nginx-1.18.0-r0
2929
pcre-8.44-r0
3030
pcre2-10.35-r0
31-
php7-7.3.19-r0
32-
php7-common-7.3.19-r0
33-
php7-fileinfo-7.3.19-r0
34-
php7-fpm-7.3.19-r0
35-
php7-json-7.3.19-r0
36-
php7-mbstring-7.3.19-r0
37-
php7-openssl-7.3.19-r0
38-
php7-session-7.3.19-r0
39-
php7-simplexml-7.3.19-r0
40-
php7-xml-7.3.19-r0
41-
php7-xmlwriter-7.3.19-r0
31+
php7-7.3.20-r0
32+
php7-common-7.3.20-r0
33+
php7-fileinfo-7.3.20-r0
34+
php7-fpm-7.3.20-r0
35+
php7-json-7.3.20-r0
36+
php7-mbstring-7.3.20-r0
37+
php7-openssl-7.3.20-r0
38+
php7-session-7.3.20-r0
39+
php7-simplexml-7.3.20-r0
40+
php7-xml-7.3.20-r0
41+
php7-xmlwriter-7.3.20-r0
4242
procps-3.3.16-r0
4343
readline-8.0.4-r0
4444
scanelf-1.2.6-r0

root/defaults/nginx.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ http {
2626
include /etc/nginx/mime.types;
2727
default_type application/octet-stream;
2828

29-
#access_log off;
30-
access_log /dev/stdout; # Only for quick debug
29+
access_log off;
3130
error_log /dev/stdout;
3231

3332
gzip on;

root/etc/cont-init.d/20-config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ sed -i 's/pm.max_children = 5/pm.max_children = 1/' /etc/php7/php-fpm.d/www.conf
3838
# copy user www2.conf to image
3939
cp /config/php/www2.conf /etc/php7/php-fpm.d/www2.conf
4040

41+
# enable/disable http trace logs
42+
43+
if [[ -z "$HTTP_TRACE" || "$HTTP_TRACE" == "false" ]]; then
44+
echo "**** Disable HTTP Trace ****"
45+
sed -i 's%access_log /dev/stdout;%access_log off;%g' /config/nginx/nginx.conf;
46+
else
47+
echo "**** Enable HTTP Trace ****"
48+
sed -i 's%access_log off;%access_log /dev/stdout;%g' /config/nginx/nginx.conf;
49+
fi
50+
4151
# permissions
4252
chown -R abc:abc \
4353
/config \

0 commit comments

Comments
 (0)