Merge remote-tracking branch 'origin/master' into N8N-4793-switch-to-n…

…ode-18
n8n-io · Nov 4, 2022 · c503158 · c503158
2 parents 5622c4c + 41cb0ee
commit c503158
Show file tree

Hide file tree

Showing 192 changed files with 5,606 additions and 4,510 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,6 +14,7 @@
 		{
 			"name": "Launch n8n with debug",
 			"program": "${workspaceFolder}/packages/cli/bin/n8n",
+			"cwd": "${workspaceFolder}/packages/cli/bin",
 			"request": "launch",
 			"skipFiles": ["<node_internals>/**"],
 			"type": "node",

diff --git a/docker/images/n8n-debian/Dockerfile b/docker/images/n8n-debian/Dockerfile
@@ -4,6 +4,7 @@ ARG N8N_VERSION
 
 RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
 
+ENV N8N_VERSION=${N8N_VERSION}
 RUN \
 	apt-get update && \
 	apt-get -y install graphicsmagick gosu git

diff --git a/docker/images/n8n-rhel7/Dockerfile b/docker/images/n8n-rhel7/Dockerfile
@@ -4,6 +4,7 @@ ARG N8N_VERSION
 
 RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
 
+ENV N8N_VERSION=${N8N_VERSION}
 RUN \
 	yum install -y gcc-c++ make
 

diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
@@ -4,15 +4,16 @@ FROM n8nio/base:${NODE_VERSION}
 ARG N8N_VERSION
 RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
 
+ENV N8N_VERSION=${N8N_VERSION}
 ENV NODE_ENV=production
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		'armv7') apk --no-cache add --virtual build-dependencies python3 build-base;; \
+	'armv7') apk --no-cache add --virtual build-dependencies python3 build-base;; \
 	esac && \
 	npm install -g --omit=dev n8n@${N8N_VERSION} && \
 	case "$apkArch" in \
-		'armv7') apk del build-dependencies;; \
+	'armv7') apk del build-dependencies;; \
 	esac && \
 	find /usr/local/lib/node_modules/n8n -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" | xargs rm && \
 	rm -rf /root/.npm
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ ARG N8N_VERSION @@
     RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
+    ENV N8N_VERSION=${N8N_VERSION}
     RUN \
     	yum install -y gcc-c++ make
@@ Expand Down @@