build: fix Dockerfile-build, bump EoL go/node

This commit is contained in:
Nihal Gonsalves 2026-03-22 00:50:47 +01:00
parent f25f0e21f0
commit 52cad203fa
No known key found for this signature in database
5 changed files with 12 additions and 26 deletions

View file

@ -9,11 +9,11 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: '1.24.x'
go-version: '1.25.x'
- name: Install node
uses: actions/setup-node@v3
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: './web/package-lock.json'
- name: Install dependencies

View file

@ -28,11 +28,11 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: '1.24.x'
go-version: '1.25.x'
- name: Install node
uses: actions/setup-node@v3
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: './web/package-lock.json'
- name: Docker login

View file

@ -25,11 +25,11 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: '1.24.x'
go-version: '1.25.x'
- name: Install node
uses: actions/setup-node@v3
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: './web/package-lock.json'
- name: Install dependencies

View file

@ -1,8 +1,8 @@
FROM golang:1.24-bullseye as builder
FROM golang:1.25-bookworm AS builder
ARG VERSION=dev
ARG COMMIT=unknown
ARG NODE_MAJOR=18
ARG NODE_MAJOR=24
RUN apt-get update && apt-get install -y \
build-essential ca-certificates curl gnupg \
@ -41,6 +41,10 @@ ADD ./server ./server
ADD ./user ./user
ADD ./util ./util
ADD ./payments ./payments
ADD ./db ./db
ADD ./message ./message
ADD ./model ./model
ADD ./webpush ./webpush
RUN make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server
FROM alpine

18
web/package-lock.json generated
View file

@ -9514,24 +9514,6 @@
"dev": true,
"license": "ISC"
},
"node_modules/yaml": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
"integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
"dev": true,
"license": "ISC",
"optional": true,
"peer": true,
"bin": {
"yaml": "bin.mjs"
},
"engines": {
"node": ">= 14.6"
},
"funding": {
"url": "https://github.com/sponsors/eemeli"
}
},
"node_modules/yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",