From 6d5ea0634cc35050fc062a00f38575096f2ba684 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, 7 Dec 2022 15:54:26 +0100
Subject: [PATCH] fix: Use the same entrypoint for custom docker images as for
 the other images (no-changelog) (#4849)

* ci: Use the same entrypoint for custom docker images as for the other images

* update docker-compose examples to use the correct volume paths to work with custom images
---
 docker/compose/withMariaDB/docker-compose.yml           | 2 +-
 docker/compose/withPostgres/docker-compose.yml          | 2 +-
 docker/compose/withPostgresAndWorker/docker-compose.yml | 2 +-
 docker/images/n8n-custom/Dockerfile                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/compose/withMariaDB/docker-compose.yml b/docker/compose/withMariaDB/docker-compose.yml
index e1c6d0d84..14e478683 100644
--- a/docker/compose/withMariaDB/docker-compose.yml
+++ b/docker/compose/withMariaDB/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     links:
       - db
     volumes:
-      - n8n_storage:/home/node/
+      - n8n_storage:/home/node/.n8n
     command: n8n start --tunnel
     depends_on:
       db:
diff --git a/docker/compose/withPostgres/docker-compose.yml b/docker/compose/withPostgres/docker-compose.yml
index fe0dd9788..c102d8183 100644
--- a/docker/compose/withPostgres/docker-compose.yml
+++ b/docker/compose/withPostgres/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     links:
       - postgres
     volumes:
-      - n8n_storage:/home/node/
+      - n8n_storage:/home/node/.n8n
     command: /bin/sh -c "n8n start --tunnel"
     depends_on:
       postgres:
diff --git a/docker/compose/withPostgresAndWorker/docker-compose.yml b/docker/compose/withPostgresAndWorker/docker-compose.yml
index e7c8d9c98..308e5abc4 100644
--- a/docker/compose/withPostgresAndWorker/docker-compose.yml
+++ b/docker/compose/withPostgresAndWorker/docker-compose.yml
@@ -24,7 +24,7 @@ x-shared: &shared
     - postgres
     - redis
   volumes:
-    - n8n_storage:/home/node/
+    - n8n_storage:/home/node/.n8n
   depends_on:
     redis:
       condition: service_healthy
diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 3d4f45247..5dd665985 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -22,11 +22,11 @@ RUN rm -rf patches .npmrc *.yaml node_modules/.cache packages/**/node_modules/.c
 # 2. Start with a new clean image with just the code that is needed to run n8n
 FROM n8nio/base:${NODE_VERSION}
 COPY --from=builder /home/node ./
-COPY docker/images/n8n-custom/docker-entrypoint.sh ./
+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"]
+ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]