diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 4fcfd1f5..6051fcdb 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.23 # # Include dist COPY dist/ /root/dist/ diff --git a/docker/nginx/builder/cyberchef/Dockerfile b/docker/nginx/builder/cyberchef/Dockerfile index 142dbd9b..a62ca049 100644 --- a/docker/nginx/builder/cyberchef/Dockerfile +++ b/docker/nginx/builder/cyberchef/Dockerfile @@ -1,4 +1,3 @@ -#FROM node:17.9.0-alpine3.15 as builder FROM node:18-alpine as builder # # Prep and build Cyberchef diff --git a/docker/nginx/builder/esvue/Dockerfile b/docker/nginx/builder/esvue/Dockerfile index 783f0ad3..abbde152 100644 --- a/docker/nginx/builder/esvue/Dockerfile +++ b/docker/nginx/builder/esvue/Dockerfile @@ -1,24 +1,22 @@ ### elasticvue build is currently broken, issue has been opened https://github.com/cars10/elasticvue/issues/215 ### in the meantime we are using the older dist, if not resolved we need to find a different solution -FROM node:22.5.1-alpine AS builder +FROM node:22.21.1-alpine AS builder # # Prep and build Elasticvue RUN apk -U --no-cache add git && \ - git clone https://github.com/cars10/elasticvue -b v1.7.0 /opt/src && \ + git clone https://github.com/cars10/elasticvue -b v1.11.1 /opt/src && \ # We need to adjust consts.ts so the user has connection suggestion for reverse proxied ES sed -i "s#export const DEFAULT_CLUSTER_URI = 'http://localhost:9200'#export const DEFAULT_CLUSTER_URI = window.location.origin + '/es'#g" /opt/src/src/consts.ts && \ sed -i 's#href="/images/logo/favicon.ico"#href="images/logo/favicon.ico"#g' /opt/src/index.html && \ mkdir /opt/app && \ cd /opt/app && \ - corepack enable && \ cp /opt/src/package.json . && \ - cp /opt/src/yarn.lock . && \ - cp /opt/src/.yarnrc.yml . && \ - yarn install && \ + cp /opt/src/package-lock.json . && \ + npm install && \ cp -R /opt/src/* . && \ export VITE_APP_BUILD_MODE=docker && \ export VITE_APP_PUBLIC_PATH="/elasticvue/" && \ - yarn build && \ + npm run build && \ cd dist && \ tar cvfz esvue.tgz * # diff --git a/docker/nginx/dist/html/cyberchef/cyberchef.tgz b/docker/nginx/dist/html/cyberchef/cyberchef.tgz index 5b6980e0..4b225e0d 100644 Binary files a/docker/nginx/dist/html/cyberchef/cyberchef.tgz and b/docker/nginx/dist/html/cyberchef/cyberchef.tgz differ diff --git a/docker/nginx/dist/html/esvue/esvue.tgz b/docker/nginx/dist/html/esvue/esvue.tgz index 57469fb7..94184101 100644 Binary files a/docker/nginx/dist/html/esvue/esvue.tgz and b/docker/nginx/dist/html/esvue/esvue.tgz differ