From b6b63ed48bad81ab7e50672e0921f0f9bc3a894f Mon Sep 17 00:00:00 2001
From: Frane Bandov <frane.bandov@gmail.com>
Date: Thu, 26 Mar 2020 18:05:23 +0100
Subject: [PATCH] Add full-icu to Dockerfiles

---
 docker/images/n8n-ubuntu/Dockerfile | 4 +++-
 docker/images/n8n/Dockerfile        | 6 ++++--
 packages/cli/commands/start.ts      | 4 ----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/images/n8n-ubuntu/Dockerfile b/docker/images/n8n-ubuntu/Dockerfile
index a76c2501a7..200506f058 100644
--- a/docker/images/n8n-ubuntu/Dockerfile
+++ b/docker/images/n8n-ubuntu/Dockerfile
@@ -11,7 +11,9 @@ RUN \
 # Set a custom user to not have n8n run as root
 USER root
 
-RUN npm_config_user=root npm install -g n8n@${N8N_VERSION}
+RUN npm_config_user=root npm install -g full-icu n8n@${N8N_VERSION}
+
+ENV NODE_ICU_DATA /usr/local/lib/node_modules/full-icu
 
 WORKDIR /data
 
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index d609d00363..c0997dcabd 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.13.0-alpine
+FROM node:12.16-alpine
 
 ARG N8N_VERSION
 
@@ -13,9 +13,11 @@ USER root
 # Install n8n and the also temporary all the packages
 # it needs to build it correctly.
 RUN apk --update add --virtual build-dependencies python build-base ca-certificates && \
-	npm_config_user=root npm install -g n8n@${N8N_VERSION} && \
+	npm_config_user=root npm install -g full-icu n8n@${N8N_VERSION} && \
 	apk del build-dependencies
 
+ENV NODE_ICU_DATA /usr/local/lib/node_modules/full-icu
+
 WORKDIR /data
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/packages/cli/commands/start.ts b/packages/cli/commands/start.ts
index f1951f5002..4e2efaacfd 100644
--- a/packages/cli/commands/start.ts
+++ b/packages/cli/commands/start.ts
@@ -20,10 +20,6 @@ import {
 } from "../src";
 
 
-// // Add support for internationalization
-// const fullIcuPath = require.resolve('full-icu');
-// process.env.NODE_ICU_DATA = dirname(fullIcuPath);
-
 let activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner | undefined;
 let processExistCode = 0;