diff --git a/Dockerfile b/Dockerfile index b4c00c2d..e5dbcd3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,11 @@ -# 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 -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - gnupg2 - # 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 \ @@ -21,11 +15,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 - # Hedera RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ 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..2fda20c4 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "24.50.16", + "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 8ca433ba..222edda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.50.16) stable; urgency=low +hedera-web (25.8.1) stable; urgency=low * Initial Release. diff --git a/debian/rules b/debian/rules index c752a06c..dc695974 100755 --- a/debian/rules +++ b/debian/rules @@ -5,14 +5,15 @@ %: dh $@ -clean: - npm run clean +override_dh_clean: + pnpm run clean + rm -rf build-deps dh_clean $@ -build: +override_dh_auto_build: pnpm install --prefer-offline pnpm exec quasar build mkdir -p build-deps - cp package.json build-deps - (cd build-deps && npm install --omit=dev --no-audit --prefer-offline) + cp package.json pnpm-lock.yaml build-deps + (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline) diff --git a/package.json b/package.json index 7ef79e86..9bc1af14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.50.18", + "version": "25.8.1", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura",