From 36dd0abf9d21d79cdddff85c3588b290033ecaa5 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 09:18:43 +0100 Subject: [PATCH 1/9] fix: use pnpm in debian/rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c752a06c..94832131 100755 --- a/debian/rules +++ b/debian/rules @@ -15,4 +15,4 @@ build: mkdir -p build-deps cp package.json build-deps - (cd build-deps && npm install --omit=dev --no-audit --prefer-offline) + (cd build-deps && pnpm install --prod --config.audit=true --prefer-offline) From 9bb0652809ae122009e9a9e55ded4d80c32260c6 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 09:18:57 +0100 Subject: [PATCH 2/9] fet: enable pnpm --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4c00c2d..a9abf5c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,9 @@ RUN a2dissite 000-default # NodeJs RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y --no-install-recommends nodejs + && apt-get install -y --no-install-recommends nodejs\ + && npm install -g corepack@0.31.0 \ + && corepack enable pnpm # Hedera From 040a3b86c200355bf6c2bd5b132e61bf8075f2ee Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 08:19:52 +0000 Subject: [PATCH 3/9] feat: patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ef79e86..ff51547b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.50.18", + "version": "24.50.19", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 7c7f1b976cb9846cd24dea36cfb7504e5c098959 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 08:00:08 +0100 Subject: [PATCH 4/9] ci: refs #4922 Docker image fixes --- Dockerfile | 3 +-- Jenkinsfile | 2 +- back/package.json | 2 +- debian/changelog | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9abf5c0..9c41bbb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870 -FROM debian:bookworm-slim +FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1 ARG DEBIAN_FRONTEND=noninteractive diff --git a/Jenkinsfile b/Jenkinsfile index ed52bdc5..8bc98b01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn8' + image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn9' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } diff --git a/back/package.json b/back/package.json index 2459d049..efd95684 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "24.50.16", + "version": "25.8.0", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 8ca433ba..01a1a9a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.50.16) stable; urgency=low +hedera-web (25.8.0) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index ff51547b..e94632e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.50.19", + "version": "25.8.0", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 0a07b0bf33db48dd29a021e6fcf274b1d5719c12 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 08:12:32 +0100 Subject: [PATCH 5/9] ci: refs #4922 Debian rules pnpm hoist --- back/package.json | 2 +- debian/changelog | 2 +- debian/rules | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/back/package.json b/back/package.json index efd95684..2fda20c4 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "25.8.0", + "version": "25.8.1", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 01a1a9a1..222edda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.8.0) stable; urgency=low +hedera-web (25.8.1) stable; urgency=low * Initial Release. diff --git a/debian/rules b/debian/rules index 94832131..6e729ebd 100755 --- a/debian/rules +++ b/debian/rules @@ -15,4 +15,4 @@ build: mkdir -p build-deps cp package.json build-deps - (cd build-deps && pnpm install --prod --config.audit=true --prefer-offline) + (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline) diff --git a/package.json b/package.json index e94632e5..9bc1af14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.8.0", + "version": "25.8.1", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 0d2b0cf02ed1dc056181182a3aa5d11b251189e7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:36:54 +0100 Subject: [PATCH 6/9] ci: refs #4922 Remove redundant installs from Dockerfile --- Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c41bbb9..2151a43e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,6 @@ FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1 ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - gnupg2 - # Apache RUN apt-get install -y --no-install-recommends \ @@ -20,13 +14,6 @@ RUN apt-get install -y --no-install-recommends \ RUN a2dissite 000-default -# NodeJs - -RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y --no-install-recommends nodejs\ - && npm install -g corepack@0.31.0 \ - && corepack enable pnpm - # Hedera RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ From c4c04d8b0fef07e5c2ea85572d28764c77c6f9e7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:41:45 +0100 Subject: [PATCH 7/9] ci: refs #4922 add apt update to Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2151a43e..e5dbcd3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ ARG DEBIAN_FRONTEND=noninteractive # Apache -RUN apt-get install -y --no-install-recommends \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ apache2 \ libapache2-mod-php \ && . /etc/apache2/envvars \ From 6f85e8d611dd9250c4cf29a4c9cb5f79fef63787 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:50:10 +0100 Subject: [PATCH 8/9] ci: refs #4922 debian/rules fix --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 6e729ebd..01f1bc2e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,11 @@ %: dh $@ -clean: - npm run clean +override_dh_clean: + pnpm run clean dh_clean $@ -build: +override_dh_auto_build: pnpm install --prefer-offline pnpm exec quasar build From 42a7503f371760a93550a9040c6848b2ec6791a1 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:57:29 +0100 Subject: [PATCH 9/9] ci: refs #4922 debian/rules fix --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 01f1bc2e..dc695974 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ override_dh_clean: pnpm run clean + rm -rf build-deps dh_clean $@ override_dh_auto_build: @@ -14,5 +15,5 @@ override_dh_auto_build: pnpm exec quasar build mkdir -p build-deps - cp package.json build-deps + cp package.json pnpm-lock.yaml build-deps (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline)