Commit 9c7b497

author

dmitriy

committed

refactored dockerfile

1 parent c00ca45 commit 9c7b497Copy full SHA for 9c7b497

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ COPY . $APP_HOME`
`52`	`52`	`COPY .env.local $APP_HOME/.env`
`53`	`53`
`54`	`54`	`# set working dir`
`55`		`-WORKDIR /var/www/laravel`
	`55`	`+WORKDIR $APP_HOME`
`56`	`56`
`57`	`57`	`# install all PHP dependencies`
`58`	`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`

Comments

(0)