Update Dockerfile for new frontend build

Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2025-05-01 15:06:14 +02:00
parent e572d2f545
commit a7b165783a
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
FROM golang:1-alpine AS builder FROM golang:1.24.2-alpine AS builder
ENV CGO_ENABLED=0 \ ENV CGO_ENABLED=0 \
GOPATH=/go \ GOPATH=/go \
@ -12,17 +12,17 @@ RUN set -ex \
curl \ curl \
git \ git \
make \ make \
nodejs-lts \ nodejs-current \
npm \ npm \
tar \ tar \
unzip \ unzip \
&& make download_libs generate-inner generate-apidocs \ && make frontend_prod generate-apidocs \
&& go install \ && go install \
-ldflags "-X main.version=$(git describe --tags --always || echo dev)" \ -ldflags "-X main.version=$(git describe --tags --always || echo dev)" \
-mod=readonly -mod=readonly
FROM alpine:latest FROM alpine:3.21
LABEL org.opencontainers.image.authors='Knut Ahlers <knut@ahlers.me>' \ LABEL org.opencontainers.image.authors='Knut Ahlers <knut@ahlers.me>' \
org.opencontainers.image.version='1.16.0' \ org.opencontainers.image.version='1.16.0' \

View file

@ -1,4 +1,4 @@
FROM golang:1-alpine AS builder FROM golang:1.24.2-alpine AS builder
ENV CGO_ENABLED=0 \ ENV CGO_ENABLED=0 \
GOPATH=/go \ GOPATH=/go \
@ -12,11 +12,11 @@ RUN set -ex \
curl \ curl \
git \ git \
make \ make \
nodejs-lts \ nodejs-current \
npm \ npm \
tar \ tar \
unzip \ unzip \
&& make download_libs generate-inner generate-apidocs \ && make frontend_prod generate-apidocs \
&& go install \ && go install \
-ldflags "-X main.version=$(git describe --tags --always || echo dev)" \ -ldflags "-X main.version=$(git describe --tags --always || echo dev)" \
-mod=readonly -mod=readonly