PootisPenserHere/payroll_manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Quality changes to docker #16

Merged
PootisPenserHere merged 9 commits from qualityChangesToDocker into master 2018-08-12 02:07:08 +00:00
Conversation 0 Commits 9 Files Changed 8 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d11218076 - Show all commits

10
api-payroll/Dockerfile
View File

@ -21,20 +21,20 @@ ENV APACHE_LOG_DIR /var/log/apache2
ENV APACHE_LOCK_DIR /var/lock/apache2 ENV APACHE_LOCK_DIR /var/lock/apache2
# Expose apache # Expose apache
EXPOSE 80 #EXPOSE 80
# Copy this repo into place. # Copy this repo into place.
ADD . /var/www/site #ADD . /var/www/site
WORKDIR /var/www/site WORKDIR /var/www/site
# Testing permisions # Testing permisions
RUN chmod 777 -R . #RUN chmod 777 -R .
# Installing dependencies # Installing dependencies
RUN composer install #RUN composer install
# Unit tests # Unit tests
RUN composer test #RUN composer test
# Update the default apache site with the config we created. # Update the default apache site with the config we created.
ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf

2
docker-compose.yml
View File

@ -6,7 +6,7 @@ services:
ports: ports:
- "8085:80" - "8085:80"
volumes: volumes:
- api-payroll:/var/www/site - ./api-payroll:/var/www/site
depends_on: depends_on:
- mysql - mysql
mysql: mysql: