mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-09 22:24:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci(core): Fix docker nightly/custom image build (no-changelog) (#5284)

Browse source 
* ci(core): Copy patches dir to Docker (no-changelog)

* Update patch

* Update package-lock

* reapply the patch

* skip patchedDependencies after the frontend is built

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
OlegIvaniv 2023-01-30 11:02:05 +01:00 committed by GitHub
parent 911d656f99
commit dbcbe595cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ FROM n8nio/base:${NODE_VERSION} as builder
COPY turbo.json package.json .npmrc pnpm-lock.yaml pnpm-workspace.yaml tsconfig.json ./ COPY turbo.json package.json .npmrc pnpm-lock.yaml pnpm-workspace.yaml tsconfig.json ./
COPY scripts ./scripts COPY scripts ./scripts
COPY packages ./packages COPY packages ./packages
COPY patches ./patches
RUN apk add --update libc6-compat jq RUN apk add --update libc6-compat jq
RUN corepack enable && corepack prepare --activate RUN corepack enable && corepack prepare --activate
@ -15,6 +16,7 @@ USER node
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile
RUN pnpm build RUN pnpm build
RUN rm -rf node_modules RUN rm -rf node_modules
RUN jq 'del(.pnpm.patchedDependencies)' package.json > package.json.tmp; mv package.json.tmp package.json
RUN jq '{name: .name, version: .version}' packages/editor-ui/package.json > editor-ui.tmp; mv editor-ui.tmp packages/editor-ui/package.json RUN jq '{name: .name, version: .version}' packages/editor-ui/package.json > editor-ui.tmp; mv editor-ui.tmp packages/editor-ui/package.json
RUN jq '{name: .name, version: .version}' packages/design-system/package.json > design-system.tmp; mv design-system.tmp packages/design-system/package.json RUN jq '{name: .name, version: .version}' packages/design-system/package.json > design-system.tmp; mv design-system.tmp packages/design-system/package.json
RUN NODE_ENV=production pnpm install --prod --no-optional RUN NODE_ENV=production pnpm install --prod --no-optional

3
patches/element-ui@2.15.12.patch
View file

@ -130,7 +130,7 @@ index 6209b8b7f21c6eea447dd4671b7c4cfc1ef5e9c2..a26772af8dcdcbc0e3a6058bda30c7f9
if (reference.nodeType === 1) { if (reference.nodeType === 1) {
Object(dom_["off"])(reference, 'mouseenter', this.show); Object(dom_["off"])(reference, 'mouseenter', this.show);
diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
index ab5d060182c2e671989f1aba190c85a074d2c754..d87f1b592d7d408d185229b9f9e29070ec2c6fe8 100644 index ab5d060182c2e671989f1aba190c85a074d2c754..8b464ad39a78ac6efead5f687d977500642e45dc 100644
--- a/packages/popover/src/main.vue --- a/packages/popover/src/main.vue
+++ b/packages/popover/src/main.vue +++ b/packages/popover/src/main.vue
@@ -98,16 +98,9 @@ export default { @@ -98,16 +98,9 @@ export default {
@ -217,7 +217,6 @@ index ab5d060182c2e671989f1aba190c85a074d2c754..d87f1b592d7d408d185229b9f9e29070
} }
}; };
</script> </script>
\ No newline at end of file
diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js
index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644 index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644
--- a/packages/tooltip/src/main.js --- a/packages/tooltip/src/main.js

6
pnpm-lock.yaml
View file

@ -15,7 +15,7 @@ overrides:
patchedDependencies: patchedDependencies:
element-ui@2.15.12: element-ui@2.15.12:
hash: aaa3sc7bmwb4jwg35ga5npx4he hash: prckukfdop5sl2her6de25cod4
path: patches/element-ui@2.15.12.patch path: patches/element-ui@2.15.12.patch
importers: importers:
@ -474,7 +474,7 @@ importers:
webpack: ^4.46.0 webpack: ^4.46.0
xss: ^1.0.14 xss: ^1.0.14
dependencies: dependencies:
element-ui: 2.15.12_aaa3sc7bmwb4jwg35ga5npx4he_vue@2.7.14 element-ui: 2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14
markdown-it: 13.0.1 markdown-it: 13.0.1
markdown-it-emoji: 2.0.2 markdown-it-emoji: 2.0.2
markdown-it-link-attributes: 4.0.1 markdown-it-link-attributes: 4.0.1
@ -10915,7 +10915,7 @@ packages:
resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
dev: true dev: true
/element-ui/2.15.12_aaa3sc7bmwb4jwg35ga5npx4he_vue@2.7.14: /element-ui/2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14:
resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==} resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==}
peerDependencies: peerDependencies:
vue: ^2.5.17 vue: ^2.5.17