Tidy up directory structure
This commit is contained in:
12
Dockerfile
12
Dockerfile
@@ -57,26 +57,26 @@ RUN php5enmod mcrypt
|
|||||||
RUN rm -Rf /etc/nginx/conf.d/* && \
|
RUN rm -Rf /etc/nginx/conf.d/* && \
|
||||||
rm -Rf /etc/nginx/sites-available/default && \
|
rm -Rf /etc/nginx/sites-available/default && \
|
||||||
mkdir -p /etc/nginx/ssl/
|
mkdir -p /etc/nginx/ssl/
|
||||||
ADD ./nginx-site.conf /etc/nginx/sites-available/default.conf
|
ADD conf/nginx-site.conf /etc/nginx/sites-available/default.conf
|
||||||
RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
|
RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
|
||||||
|
|
||||||
# Add git commands to allow container updating
|
# Add git commands to allow container updating
|
||||||
ADD ./pull /usr/bin/pull
|
ADD scripts/pull /usr/bin/pull
|
||||||
ADD ./push /usr/bin/push
|
ADD scripts/push /usr/bin/push
|
||||||
RUN chmod 755 /usr/bin/pull && chmod 755 /usr/bin/push
|
RUN chmod 755 /usr/bin/pull && chmod 755 /usr/bin/push
|
||||||
|
|
||||||
# Supervisor Config
|
# Supervisor Config
|
||||||
ADD ./supervisord.conf /etc/supervisord.conf
|
ADD conf/supervisord.conf /etc/supervisord.conf
|
||||||
|
|
||||||
# Start Supervisord
|
# Start Supervisord
|
||||||
ADD ./start.sh /start.sh
|
ADD scripts/start.sh /start.sh
|
||||||
RUN chmod 755 /start.sh
|
RUN chmod 755 /start.sh
|
||||||
|
|
||||||
# Setup Volume
|
# Setup Volume
|
||||||
VOLUME ["/usr/share/nginx/html"]
|
VOLUME ["/usr/share/nginx/html"]
|
||||||
|
|
||||||
# add test PHP file
|
# add test PHP file
|
||||||
ADD ./index.php /usr/share/nginx/html/index.php
|
ADD src/index.php /usr/share/nginx/html/index.php
|
||||||
RUN chown -Rf www-data.www-data /usr/share/nginx/html/
|
RUN chown -Rf www-data.www-data /usr/share/nginx/html/
|
||||||
|
|
||||||
# Expose Ports
|
# Expose Ports
|
||||||
|
|||||||
Reference in New Issue
Block a user