Skip to content

Commit

Permalink
fix(docker): Revert docker USER and WORKDIR changes (#3992)
Browse files Browse the repository at this point in the history
Switching from `root` to another user needs a bit more testing, as we need to figure out how to auto-migrate all existing instances of n8n when people upgrade.
  • Loading branch information
netroy authored Sep 1, 2022
1 parent 2a539d7 commit 34a99fd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
12 changes: 5 additions & 7 deletions docker/images/n8n/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ RUN set -eux; \
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"]
# Set a custom user to not have n8n run as root
USER root
WORKDIR /data
COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
13 changes: 11 additions & 2 deletions docker/images/n8n/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
#!/bin/sh

if [ -d /root/.n8n ] ; then
chmod o+rx /root
chown -R node /root/.n8n
ln -s /root/.n8n /home/node/
fi

chown -R node /home/node

if [ "$#" -gt 0 ]; then
# Got started with arguments
exec node "$@"
exec su-exec node "$@"
else
# Got started without arguments
exec n8n
exec su-exec n8n
fi

0 comments on commit 34a99fd

Please sign in to comment.