From dbcbe595ccec2075b5aded5cb00b11aafd61db02 Mon Sep 17 00:00:00 2001 From: OlegIvaniv Date: Mon, 30 Jan 2023 11:02:05 +0100 Subject: [PATCH] ci(core): Fix docker nightly/custom image build (no-changelog) (#5284) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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: कारतोफ्फेलस्क्रिप्ट™ --- docker/images/n8n-custom/Dockerfile | 2 ++ patches/element-ui@2.15.12.patch | 3 +-- pnpm-lock.yaml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile index 6f49901cdc..76ee6ded63 100644 --- a/docker/images/n8n-custom/Dockerfile +++ b/docker/images/n8n-custom/Dockerfile @@ -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 scripts ./scripts COPY packages ./packages +COPY patches ./patches RUN apk add --update libc6-compat jq RUN corepack enable && corepack prepare --activate @@ -15,6 +16,7 @@ USER node RUN pnpm install --frozen-lockfile RUN pnpm build 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/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 diff --git a/patches/element-ui@2.15.12.patch b/patches/element-ui@2.15.12.patch index 1b598f92bc..3f7ef6e50a 100644 --- a/patches/element-ui@2.15.12.patch +++ b/patches/element-ui@2.15.12.patch @@ -130,7 +130,7 @@ index 6209b8b7f21c6eea447dd4671b7c4cfc1ef5e9c2..a26772af8dcdcbc0e3a6058bda30c7f9 if (reference.nodeType === 1) { Object(dom_["off"])(reference, 'mouseenter', this.show); 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 +++ b/packages/popover/src/main.vue @@ -98,16 +98,9 @@ export default { @@ -217,7 +217,6 @@ index ab5d060182c2e671989f1aba190c85a074d2c754..d87f1b592d7d408d185229b9f9e29070 } }; -\ No newline at end of file diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644 --- a/packages/tooltip/src/main.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bbbbf612e..81c68eca18 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,7 +15,7 @@ overrides: patchedDependencies: element-ui@2.15.12: - hash: aaa3sc7bmwb4jwg35ga5npx4he + hash: prckukfdop5sl2her6de25cod4 path: patches/element-ui@2.15.12.patch importers: @@ -474,7 +474,7 @@ importers: webpack: ^4.46.0 xss: ^1.0.14 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-emoji: 2.0.2 markdown-it-link-attributes: 4.0.1 @@ -10915,7 +10915,7 @@ packages: resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} 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==} peerDependencies: vue: ^2.5.17