diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 72b9e360..1baa82c2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 55a54d60..4ebb9d56 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8d80b960..94f08fd9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 diff --git a/Dockerfile-build b/Dockerfile-build index 0fe16cf9..23503fd7 100644 --- a/Dockerfile-build +++ b/Dockerfile-build @@ -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 \ @@ -21,14 +21,14 @@ ADD Makefile . # docs ADD ./requirements.txt . -RUN make docs-deps +RUN --mount=type=cache,target=/root/.cache/pip make docs-deps ADD ./mkdocs.yml . ADD ./docs ./docs RUN make docs-build # web ADD ./web/package.json ./web/package-lock.json ./web/ -RUN make web-deps +RUN --mount=type=cache,target=/root/.npm make web-deps ADD ./web ./web RUN make web-build @@ -41,7 +41,11 @@ ADD ./server ./server ADD ./user ./user ADD ./util ./util ADD ./payments ./payments -RUN make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server +ADD ./db ./db +ADD ./message ./message +ADD ./model ./model +ADD ./webpush ./webpush +RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server FROM alpine diff --git a/web/package-lock.json b/web/package-lock.json index e2ec6f9f..513b0ab8 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -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",