Add Dockerfile.dev that installs Yarn

koistya · koistya · commit 27724a42517c · 2016-12-28T20:48:39.000+03:00
- Add Dockerfile.dev that installs Yarn, this helps with startup time
- Ensure that Node.js modules are installed during the initial launch (docker-compose up)
- Remove named volume for NPM cache
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 build
 node_modules
 npm-debug.log
+yarn-error.log
 .env
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
 FROM node:7.3.0-alpine
 
-# Copy application files
-COPY ./build /usr/src/app
+# Set a working directory
 WORKDIR /usr/src/app
 
-# Install Node.js dependencies
-RUN npm install -g yarn --no-progress --silent \
+# Copy application files
+COPY build .
+
+# Install Yarn and Node.js dependencies
+RUN npm install yarn --global --no-progress --silent --depth 0 \
     && yarn install --production --no-progress
 
 CMD [ "node", "server.js" ]
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,2 @@
+FROM node:7.3.0-alpine
+RUN npm install yarn --global --no-progress --silent --depth 0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,18 +3,19 @@ version: '2'
 services:
 
   api:
-    image: node:7.3.0-alpine
+    build:
+      context: .
+      dockerfile: ./Dockerfile.dev
     restart: always
     env_file: .env
-    ports:
-      - $PORT:$PORT
-      - '127.0.0.1:9229:9229' # V8 inspector
     links:
       - postgres
       - redis
+    ports:
+      - $PORT:$PORT
+      - '127.0.0.1:9229:9229' # V8 inspector
     volumes:
-      - api-yarn-cache:/root/.cache/yarn
-      - api-npm-cache:/root/.npm
+      - yarn:/root/.cache/yarn
       - ./:/usr/src/app
     working_dir: /usr/src/app
     command: node scripts/run.js
@@ -27,18 +28,17 @@ services:
       - /run/postgresql
       - /tmp
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql/data
       - ./scripts/postgres-init.sh:/docker-entrypoint-initdb.d/init.sh
 
   redis:
     image: redis:3.2.6-alpine
     restart: always
     read_only: true
     volumes:
-      - redis-data:/data
+      - redis:/data
 
 volumes:
-  api-yarn-cache:
-  api-npm-cache:
-  postgres-data:
-  redis-data:
+  yarn:
+  postgres:
+  redis:
diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Read application name from 'package.json'
 SERVICE_NAME=$(cat package.json \
diff --git a/scripts/run.js b/scripts/run.js
@@ -8,9 +8,10 @@
  */
 
 const fs = require('fs');
+const path = require('path');
 const cp = require('child_process');
+const task = require('./task');
 
-let task;
 let build;
 let server;
 
@@ -36,18 +37,22 @@ process.on('SIGTERM', () => process.emit('cleanup'));
 // Ensure that Node.js modules were installed,
 // at least those required to build and launch the app
 try {
-  task = require('./task');
   build = require('./build');
 } catch (err) {
   if (err.code !== 'MODULE_NOT_FOUND') throw err;
-  console.log('Installing Node.js modules...');
-  // Install Yarn if it's missing. TODO: Use a Node.js image with Yarn pre-installed.
-  if (!fs.existsSync('/usr/local/bin/yarn')) {
-    cp.spawnSync('npm', ['install', 'yarn', '-g', '--silent'], { stdio: ['ignore', 'ignore', 'inherit'] });
-  }
   // Install Node.js modules with Yarn
   cp.spawnSync('yarn', ['install', '--no-progress'], { stdio: 'inherit' });
-  process.exit(0);
+
+  // Clear Module's internal cache
+  try {
+    const Module = require('module');
+    const m = new Module();
+    // eslint-disable-next-line
+    m._compile(fs.readFileSync('./scripts/build.js', 'utf8'), path.resolve('./scripts/build.js'));
+  } catch (error) { } // eslint-disable-line
+
+  // Reload dependencies
+  build = require('./build');
 }
 
 module.exports = task('run', () => Promise.resolve()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+FROM node:7.3.0-alpine`
	`2`	`+RUN npm install yarn --global --no-progress --silent --depth 0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/bin/sh -e`
`2`	`2`
`3`	`3`	`# Read application name from 'package.json'`
`4`	`4`	`SERVICE_NAME=$(cat package.json \`