Merge pull request #236 from ComputerScienceHouse/docker_multistage

Splitting into multistage

Author: devinmatte

.dockerignore

@@ -0,0 +1,10 @@
+Dockerfile
+.dockerignore
+.gitignore
+.nvmrc
+node_modules
+assets/dist
+assets/prod
+LICENSE
+README.md
+

Dockerfile

@@ -1,4 +1,17 @@
-FROM php:7.1-apache
+FROM node:10-buster-slim as builder
+LABEL author="Devin Matte <[email protected]>"
+
+WORKDIR /usr/src/schedule
+COPY package.json ./
+
+RUN npm install
+
+COPY package.json tsconfig.json gulpfile.js ./
+COPY assets ./assets
+RUN npm run-script build
+
+
+FROM php:7.3-apache as php-setup
 LABEL author="Devin Matte <[email protected]>"
 
 RUN echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
@@ -21,6 +34,7 @@ RUN apt-get -yq update && \
         libjpeg-dev \
         libfreetype6-dev \
         libxml2-dev \
+        unzip \
         wget \
         --no-install-recommends
 
@@ -40,22 +54,18 @@ RUN docker-php-ext-install mysqli && \
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+
+FROM php-setup
+LABEL author="Devin Matte <[email protected]>"
+
 COPY apache-config.conf /etc/apache2/sites-enabled/000-default.conf
 
 RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
     sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf && \
     chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
 
 COPY . /var/www/html
-
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-    && apt-get -yq update \
-    && apt-get -yq install nodejs --no-install-recommends \
-    && npm install \
-    && npm run-script build \
-    && apt-get -yq remove nodejs \
-    && apt-get -yq clean all \
-    && rm -rf node_modules
+COPY --from=builder /usr/src/schedule/assets/prod /var/www/html/assets/prod
 
 RUN composer install
 

tsconfig.json

@@ -1,8 +1,8 @@
 {
     "include": [
-        "assets/src/modules/sm/**/*.ts"
+        "./assets/src/modules/sm/**/*.ts"
     ],
-    "exclude": ["node_modules"],
+    "exclude": ["./node_modules"],
     "compilerOptions": {
         "module": "es2015",
         "allowJs": false,