mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 12:44:07 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Use the same entrypoint for custom docker images as for the other images (no-changelog) (#4849)

Browse source 
* 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
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2022-12-07 15:54:26 +01:00 committed by GitHub
parent fbb8611ae2
commit 6d5ea0634c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/compose/withMariaDB/docker-compose.yml
View file

@ -36,7 +36,7 @@ services:
links: links:
- db - db
volumes: volumes:
- n8n_storage:/home/node/ - n8n_storage:/home/node/.n8n
command: n8n start --tunnel command: n8n start --tunnel
depends_on: depends_on:
db: db:

2
docker/compose/withPostgres/docker-compose.yml
View file

@ -41,7 +41,7 @@ services:
links: links:
- postgres - postgres
volumes: volumes:
- n8n_storage:/home/node/ - n8n_storage:/home/node/.n8n
command: /bin/sh -c "n8n start --tunnel" command: /bin/sh -c "n8n start --tunnel"
depends_on: depends_on:
postgres: postgres:

2
docker/compose/withPostgresAndWorker/docker-compose.yml
View file

@ -24,7 +24,7 @@ x-shared: &shared
- postgres - postgres
- redis - redis
volumes: volumes:
- n8n_storage:/home/node/ - n8n_storage:/home/node/.n8n
depends_on: depends_on:
redis: redis:
condition: service_healthy condition: service_healthy

4
docker/images/n8n-custom/Dockerfile
View file

@ -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 # 2. Start with a new clean image with just the code that is needed to run n8n
FROM n8nio/base:${NODE_VERSION} FROM n8nio/base:${NODE_VERSION}
COPY --from=builder /home/node ./ COPY --from=builder /home/node ./
COPY docker/images/n8n-custom/docker-entrypoint.sh ./ COPY docker/images/n8n-custom/docker-entrypoint.sh /
RUN \ RUN \
mkdir .n8n && \ mkdir .n8n && \
chown node:node .n8n chown node:node .n8n
USER node USER node
ENV NODE_ENV=production ENV NODE_ENV=production
ENTRYPOINT ["tini", "--", "./docker-entrypoint.sh"] ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]