From 346ebee584aa31a2f762dadd4cabbac3302bf584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 31 Aug 2022 19:34:30 +0200
Subject: [PATCH] fix(docker): Make the docker images backward compatible
 (#3987)

---
 docker/images/n8n-custom/Dockerfile | 4 ++++
 docker/images/n8n/Dockerfile        | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 829bc98c4..88642c1a2 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -29,6 +29,10 @@ RUN \
 FROM n8nio/base:${NODE_VERSION}
 COPY --from=builder /home/node ./
 COPY docker/images/n8n-custom/docker-entrypoint.sh ./
+
+RUN \
+	mkdir .n8n && \
+	chown node:node .n8n
 USER node
 ENV NODE_ENV=production
 ENTRYPOINT ["tini", "--", "./docker-entrypoint.sh"]
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 30faade84..99044a067 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -10,13 +10,17 @@ RUN set -eux; \
 	case "$apkArch" in \
 		'armv7') apk --no-cache add --virtual build-dependencies python3 build-base;; \
 	esac && \
-	npm install --loglevel=info -g --omit=dev n8n@${N8N_VERSION} && \
+	npm install -g --omit=dev n8n@${N8N_VERSION} && \
 	case "$apkArch" in \
 		'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
 
+RUN \
+	mkdir .n8n && \
+	chown node:node .n8n && \
+	ln -s /docker-entrypoint.sh /home/node/docker-entrypoint.sh
 USER node
 COPY docker-entrypoint.sh ./
 ENTRYPOINT ["tini", "--", "./docker-entrypoint.sh"]