Merge branch 'feature/docker' into develop

Author: adenvt

Dockerfile

@@ -8,7 +8,7 @@ COPY package-lock.json /var/www
 RUN npm ci
 
 COPY . /var/www
-RUN npm run prod
+# RUN npm run prod
 RUN rm -rf /var/www/node_modules/
 
 FROM php:7.2-fpm AS server
@@ -51,6 +51,12 @@ COPY deploy/web/mime.types /etc/nginx/mime.types
 COPY deploy/web/php.ini /usr/local/etc/php/php.ini
 COPY --from=compiler /var/www /var/www
 
+# Force HTTPS
+ARG FORCE_HTTPS=false
+RUN if [ ${FORCE_HTTPS} = true ]; then \
+  sed -i 's/# fastcgi_param HTTPS/fastcgi_param HTTPS/' /etc/nginx/sites-available/default \
+;fi
+
 RUN composer dump-autoload --no-dev --optimize
 RUN chown -R www-data:www-data /var/www
 RUN php artisan config:cache \

README.md

@@ -84,14 +84,14 @@ npm run watch
 ## or using Hot Module Replacement
 npm run hot
 ```
-* Open browser, goto `http://localhost:8080`
+* Open browser, goto `http://localhost:8888`
 
 ### For Production
 * Create and run Container
 ```
 docker-compose up -d prod
 ```
-* Open browser, goto `http://localhost:8888`
+* Open browser, goto `http://localhost:88`
 
 
 

deploy/dev/Dockerfile

@@ -13,12 +13,16 @@ RUN set -x \
     git \
     unzip \
     zlib1g-dev \
-    gnupg
+    gnupg \
+    libpng-dev \
+    vim \
+  && apt-get clean
 
 # Install Node
 RUN curl --silent --location https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install --no-install-recommends --no-install-suggests -y \
-  nodejs
+    nodejs \
+  && apt-get clean
 
 # Install PHP Plugin
 RUN docker-php-ext-install zip
@@ -29,6 +33,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # Install Composer
 ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN composer config -g repos.packagist composer https://packagist.jp
 RUN composer global require hirak/prestissimo
 
 # Configuring NGINX
@@ -37,8 +42,18 @@ COPY deploy/web/nginx.conf /etc/nginx/nginx.conf
 COPY deploy/web/mime.types /etc/nginx/mime.types
 COPY deploy/web/php.ini /usr/local/etc/php/
 
+# Force HTTPS
+ARG FORCE_HTTPS=false
+RUN if [ ${FORCE_HTTPS} = true ]; then \
+  sed -i 's/# fastcgi_param HTTPS/fastcgi_param HTTPS/' /etc/nginx/sites-available/default \
+;fi
+
+# Cleanup
 RUN rm -rf /var/www/html/
 
 EXPOSE 80 443 8080
 
+ENV MIX_HMR_HOST=0.0.0.0
+ENV MIX_HMR_PORT=8080
+
 CMD service nginx start && php-fpm

deploy/web/site.conf

@@ -4,8 +4,9 @@ server {
   error_log  /var/log/nginx/error.log;
   access_log /var/log/nginx/access.log;
 
-  root  $root_path;
+  root $root_path;
   index index.php;
+  server_name _;
 
   add_header X-Frame-Options        "SAMEORIGIN";
   add_header X-XSS-Protection       "1; mode=block";
@@ -31,7 +32,7 @@ server {
     fastcgi_pass                  127.0.0.1:9000;
     fastcgi_split_path_info       ^(.+\.php)(/.+)$;
     fastcgi_intercept_errors      on;
-    fastcgi_param HTTPS           on;
+    # fastcgi_param HTTPS           on;
     fastcgi_param PATH_INFO       $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $root_path$fastcgi_script_name;
   }

docker-compose.yml

@@ -1,15 +1,20 @@
 version: '3'
 services:
   prod:
-    build: ./
+    build:
+      context: ./
+      args:
+        - FORCE_HTTPS=false
     ports:
-     - 8888:80
+     - 88:80
   dev:
     build:
       context: ./
       dockerfile: deploy/dev/Dockerfile
+      args:
+        - FORCE_HTTPS=false
     volumes:
       - ./:/var/www
     ports:
+      - 8888:80
       - 8080:8080
-      - 8000:80

webpack.mix.js

@@ -84,8 +84,8 @@ mix.extract([
 
 mix.options({
   hmrOptions: {
-    host: '0.0.0.0',
-    port: 8080,
+    host: process.env.MIX_HMR_HOST,
+    port: process.env.MIX_HMR_PORT,
   },
   uglify: { parallel: true },
 })