mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' of github.com:n8n-io/n8n

Browse source
This commit is contained in:
Jan Oberhauser 2020-02-07 17:08:03 -08:00
parent bb487c9d96 c877df0fdd
commit b6b5935c57
7 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docker/images/n8n-ubuntu/Dockerfile
View file

@ -6,7 +6,7 @@ RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!"
RUN \ RUN \
apt-get update && \ apt-get update && \
apt-get -y install graphicsmagick apt-get -y install graphicsmagick gosu
# Set a custom user to not have n8n run as root # Set a custom user to not have n8n run as root
USER root USER root
@ -15,4 +15,5 @@ RUN npm_config_user=root npm install -g n8n@${N8N_VERSION}
WORKDIR /data WORKDIR /data
CMD "n8n" COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["/docker-entrypoint.sh"]

9
docker/images/n8n-ubuntu/docker-entrypoint.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
if [ -d /root/.n8n ] ; then
chmod o+rx /root
chown -R node /root/.n8n
ln -s /root/.n8n /home/node/
fi
exec gosu node n8n

5
docker/images/n8n/Dockerfile
View file

@ -5,7 +5,7 @@ ARG N8N_VERSION
RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
# Update everything and install needed dependencies # Update everything and install needed dependencies
RUN apk add --update graphicsmagick tzdata git RUN apk add --update graphicsmagick tzdata git tini su-exec
# # Set a custom user to not have n8n run as root # # Set a custom user to not have n8n run as root
USER root USER root
@ -18,4 +18,5 @@ RUN apk --update add --virtual build-dependencies python build-base ca-certifica
WORKDIR /data WORKDIR /data
CMD ["n8n"] COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]

9
docker/images/n8n/docker-entrypoint.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
if [ -d /root/.n8n ] ; then
chmod o+rx /root
chown -R node /root/.n8n
ln -s /root/.n8n /home/node/
fi
exec su-exec node n8n

2
packages/editor-ui/src/components/ExpressionEdit.vue
View file

@ -102,7 +102,7 @@ export default Vue.extend({
margin-top: 1em; margin-top: 1em;
} }
/deep/ .expression-dialog { ::v-deep .expression-dialog {
.el-dialog__header { .el-dialog__header {
padding: 0; padding: 0;
} }

6
packages/editor-ui/src/components/MultipleParameter.vue
View file

@ -138,7 +138,7 @@ export default mixins(genericHelpers)
} }
} }
/deep/ .duplicate-parameter-item { ::v-deep .duplicate-parameter-item {
position: relative; position: relative;
margin-top: 0.5em; margin-top: 0.5em;
padding-top: 0.5em; padding-top: 0.5em;
@ -148,11 +148,11 @@ export default mixins(genericHelpers)
} }
} }
/deep/ .duplicate-parameter-input-item { ::v-deep .duplicate-parameter-input-item {
margin: 0.5em 0 0.25em 2em; margin: 0.5em 0 0.25em 2em;
} }
/deep/ .duplicate-parameter-item + .duplicate-parameter-item { ::v-deep .duplicate-parameter-item + .duplicate-parameter-item {
.collection-parameter-wrapper { .collection-parameter-wrapper {
border-top: 1px dashed #999; border-top: 1px dashed #999;
padding-top: 0.5em; padding-top: 0.5em;

2
packages/node-dev/src/Build.ts
View file

@ -64,7 +64,7 @@ export async function buildFiles (options?: IBuildOptions): Promise<string> {
options = options || {}; options = options || {};
// Get the path of the TypeScript cli of this project // Get the path of the TypeScript cli of this project
const tscPath = join(__dirname, '../../node_modules/typescript/bin/tsc'); const tscPath = join(__dirname, '../../node_modules/.bin/tsc');
const tsconfigData = await createCustomTsconfig(); const tsconfigData = await createCustomTsconfig();