Andrey/OCSInventory-Docker-Image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improving the Dockerfile

Browse Source 
- Configure Apache2 to output Logs to stdout and stderr
- Based on 5f92ab1814/2.4/Dockerfile (L202)
- Remove unecessary layers to WORKDIR and using directory params
This commit is contained in:
Wilton Rodrigues 2021-10-30 11:23:24 -03:00
parent 5ed05a5946
commit a1c948f57f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
2.9/Dockerfile
View File

@ -18,8 +18,6 @@ ENV APACHE_RUN_USER=apache APACHE_RUN_GROUP=apache \
VOLUME /var/lib/ocsinventory-reports /etc/ocsinventory-server /usr/share/ocsinventory-reports/ocsreports/extensions
WORKDIR /tmp
RUN yum ${YUM_FLAGS} install wget \
curl \
yum-utils \
@ -65,17 +63,23 @@ RUN yum ${YUM_FLAGS} install wget \
php73-php-zip \
php73-php-opcache ;
RUN wget https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/download/${OCS_VERSION}/OCSNG_UNIX_SERVER-${OCS_VERSION}.tar.gz && \
tar xzf OCSNG_UNIX_SERVER-${OCS_VERSION}.tar.gz ;
RUN wget https://github.com/OCSInventory-NG/OCSInventory-ocsreports/releases/download/${OCS_VERSION}/OCSNG_UNIX_SERVER-${OCS_VERSION}.tar.gz -P /tmp && \
tar xzf /tmp/OCSNG_UNIX_SERVER-${OCS_VERSION}.tar.gz -C /tmp;
WORKDIR /tmp/OCSNG_UNIX_SERVER-${OCS_VERSION}
RUN cd Apache/ && \
RUN cd /tmp/OCSNG_UNIX_SERVER-${OCS_VERSION}/Apache/ && \
perl Makefile.PL && \
make && \
make install ;
WORKDIR /tmp
WORKDIR /etc/httpd/conf.d
# Redirect Apache2 Logs to stdout e stderr
# https://github.com/docker-library/httpd/blob/5f92ab18146f41d1d324e99c5e197bdeda65d063/2.4/Dockerfile#L202
RUN sed -ri \
-e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
"/etc/httpd/conf/httpd.conf"
COPY conf/ /tmp/conf
COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh