Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit f6ee3f45 authored by Nicolas's avatar Nicolas
Browse files

refactoring

parent c5e451b5
No related branches found
No related tags found
No related merge requests found
......@@ -7,31 +7,29 @@ LABEL company="Béjean Développement"
LABEL website="www.bejean.eu"
LABEL version="1.0"
# Addgroup and adduser
RUN addgroup -g 1000 app \
&& adduser -D -H -h /var/www -s /sbin/nologin -G app -u 1000 app
# Change port 80 to 8000
RUN sed -i 's/Listen 80/Listen 8000/g' /usr/local/apache2/conf/httpd.conf
# Change user and group www-data to app
RUN sed -i 's/User www-data/User app/g' /usr/local/apache2/conf/httpd.conf
RUN sed -i 's/Group www-data/Group app/g' /usr/local/apache2/conf/httpd.conf
# Update server name
RUN sed -i 's/^#ServerName.*/ServerName localhost:8000/' /usr/local/apache2/conf/httpd.conf
# Change port and update server name
RUN sed -i \
-e 's/Listen 80/Listen 8000/' \
-e 's/^#ServerName.*/ServerName localhost:8000/' \
/usr/local/apache2/conf/httpd.conf
# Enable proxy and fcgi modules
RUN sed -i 's/^#\(LoadModule proxy_module modules\/mod_proxy.so\)/\1/' /usr/local/apache2/conf/httpd.conf
RUN sed -i 's/^#\(LoadModule proxy_fcgi_module modules\/mod_proxy_fcgi.so\)/\1/' /usr/local/apache2/conf/httpd.conf
RUN sed -i \
-e 's/^#\(LoadModule proxy_module modules\/mod_proxy.so\)/\1/' \
-e 's/^#\(LoadModule proxy_fcgi_module modules\/mod_proxy_fcgi.so\)/\1/' \
/usr/local/apache2/conf/httpd.conf
# Add vhost configuration and copye vhost file
RUN sed -i 's/#Include\ conf\/extra\/httpd-vhosts.conf/Include\ conf\/extra\/httpd-vhosts.conf/' /usr/local/apache2/conf/httpd.conf
# Add vhost configuration and copy vhost file
COPY conf/httpd-vhosts.conf /usr/local/apache2/conf/extra/httpd-vhosts.conf
RUN sed -i \
-e 's/#Include\ conf\/extra\/httpd-vhosts.conf/Include\ conf\/extra\/httpd-vhosts.conf/' \
/usr/local/apache2/conf/httpd.conf
# Create directories and upate permissions
RUN mkdir -p /var/www/html \
&& chown -R app:app /var/www/html /usr/local/apache2/logs
# Create users, directories and update permissions
RUN addgroup -g 1000 app \
&& adduser -D -H -h /var/www/html -s /sbin/nologin -G app -u 1000 app \
&& mkdir -p /var/www/html /usr/local/apache2/logs \
&& chown -R app:app /var/www/html /usr/local/apache2/logs
# Change owner and group
USER app:app
......@@ -43,4 +41,7 @@ WORKDIR /var/www/html
EXPOSE 8000
# Start apache
CMD /usr/local/apache2/bin/httpd -D FOREGROUND
CMD ["httpd-foreground"]
......@@ -7,26 +7,23 @@ LABEL company="Béjean Développement"
LABEL website="www.bejean.eu"
LABEL version="1.0"
# Addgroup and adduser
RUN addgroup -g 1000 app \
&& adduser -D -H -h /var/www -s /sbin/nologin -G app -u 1000 app
# Change listen parameter
RUN sed -i 's/^listen = 127.0.0.1:9000*/listen = 9000/' /usr/local/etc/php-fpm.d/www.conf
# Change user and group www-data to app
RUN sed -i 's/^user = www-data*/user = app/' /usr/local/etc/php-fpm.d/www.conf
RUN sed -i 's/^group = www-data*/group = app/' /usr/local/etc/php-fpm.d/www.conf
RUN sed -i 's/^;listen.owner = www-data*/listen.owner = app/' /usr/local/etc/php-fpm.d/www.conf
RUN sed -i 's/^;listen.group = www-data*/listen.group = app/' /usr/local/etc/php-fpm.d/www.conf
# Set timezone
ENV TZ=Europe/Paris
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Create directories and upate permissions
RUN mkdir -p /var/www/html /sock /var/log/php \
&& chown -R app:app /var/www /usr/local/etc /sock /var/log/php
# Change port and update user, owner and group
RUN sed -i \
-e 's/^user = www-data*/user = app/' \
-e 's/^group = www-data*/group = app/' \
-e 's/^;listen.owner = www-data*/listen.owner = app/' \
-e 's/^;listen.group = www-data*/listen.group = app/' \
/usr/local/etc/php-fpm.d/www.conf
# Create users, directories and update permissions
RUN addgroup -g 1000 app \
&& adduser -D -H -h /var/www/html -s /sbin/nologin -G app -u 1000 app \
&& mkdir -p /var/www/html /sock /var/log/php \
&& chown -R app:app /var/www/html /usr/local/etc /sock /var/log/php
# Change owner and group
USER app:app
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment