Commit 9c29ea5

authored

Merge pull request #1 from dimadeush/ci-test

checking integration with CI

2 parents a4795ee + 9c7b497 commit 9c29ea5Copy full SHA for 9c29ea5

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 0 additions & 2 deletions

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,12 @@ RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private`
`47`	`47`	`RUN a2enmod rewrite`
`48`	`48`	`RUN a2enmod ssl`
`49`	`49`
`50`		`-# copy source files and run composer`
	`50`	`+# copy source files and config file`
`51`	`51`	`COPY . $APP_HOME`
	`52`	`+COPY .env.local $APP_HOME/.env`
`52`	`53`
`53`	`54`	`# set working dir`
`54`		`-WORKDIR /var/www/laravel`
	`55`	`+WORKDIR $APP_HOME`
`55`	`56`
`56`	`57`	`# install all PHP dependencies`
`57`	`58`	`RUN composer install --no-interaction --no-progress`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,23 @@ RUN usermod -u 1000 www-data && groupmod -g 1000 www-data`
`32`	`32`
`33`	`33`	`# put apache and php configs for Laravel`
`34`	`34`	`COPY ./docker/hosts/laravel.conf /etc/apache2/sites-available/laravel.conf`
`35`		`-RUN a2dissite 000-default.conf && a2ensite laravel.conf`
	`35`	`+COPY ./docker/hosts/laravel-ssl.conf /etc/apache2/sites-available/laravel-ssl.conf`
	`36`	`+RUN a2dissite 000-default.conf && a2ensite laravel.conf && a2ensite laravel-ssl`
`36`	`37`	`COPY ./docker/production/php.ini /usr/local/etc/php/php.ini`
`37`	`38`
	`39`	`+# generate certificates. TODO: change it`
	`40`	`+RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"`
	`41`	`+`
`38`	`42`	`# enable apache modules`
`39`	`43`	`RUN a2enmod rewrite`
	`44`	`+RUN a2enmod ssl`
`40`	`45`
`41`		`-# copy source files and run composer`
	`46`	`+# copy source files and config file`
`42`	`47`	`COPY . $APP_HOME`
	`48`	`+COPY .env.prod $APP_HOME/.env`
`43`	`49`
`44`	`50`	`# set working dir`
`45`		`-WORKDIR /var/www/laravel`
	`51`	`+WORKDIR $APP_HOME`
`46`	`52`
`47`	`53`	`# install all PHP dependencies`
`48`	`54`	`RUN composer install --no-interaction --no-progress --no-dev`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`# PHP Laravel environment`
`2`	`2`	`Docker environment required to run Laravel (based on official php and mysql docker hub repositories).`
`3`	`3`
	`4`	`+[![CircleCI](https://circleci.com/gh/dimadeush/docker-apache-php-laravel.svg?style=svg)](https://circleci.com/gh/dimadeush/docker-apache-php-laravel)`
	`5`	`+`
`4`	`6`	`[Source code](https://github.com/dimadeush/docker-apache-php-laravel.git)`
`5`	`7`
`6`	`8`	`## Requirements`

Comments

(0)