diff --git a/Makefile b/Makefile index 63cdccf0..5a24d90c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ RELEASE_DARWIN_AMD64 = $(RELEASE_ROOT)/darwin-amd64/$(PROJECT) RELEASE_DARWIN_ARM64 = $(RELEASE_ROOT)/darwin-arm64/$(PROJECT) RELEASE_WINDOWS_AMD64 = $(RELEASE_ROOT)/windows-amd64/$(PROJECT) -BUILD_VERSION := $(shell git describe --tags --always | cut -f1 -f2 -d "-") +BUILD_VERSION := $(shell git describe --tags --always | cut -f 1 -f 2 -d "-") BUILD_DATE := $(shell date +'%Y-%m-%d %H:%M:%S') SHA_SHORT := $(shell git rev-parse --short HEAD) diff --git a/scripts/docker/Dockerfile-backend-builder b/scripts/docker/Dockerfile-backend-builder index cd523edf..d6858ab1 100644 --- a/scripts/docker/Dockerfile-backend-builder +++ b/scripts/docker/Dockerfile-backend-builder @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine +FROM golang:1.21-alpine RUN apk --no-cache --no-progress add --virtual \ build-deps \ build-base \ diff --git a/scripts/docker/Dockerfile-backend-runner b/scripts/docker/Dockerfile-backend-runner index 7e8589f8..cba2776e 100644 --- a/scripts/docker/Dockerfile-backend-runner +++ b/scripts/docker/Dockerfile-backend-runner @@ -1,3 +1,3 @@ -FROM alpine:3.17 +FROM alpine:3.18 ENV TZ=Asia/Shanghai RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates diff --git a/web/Dockerfile b/web/Dockerfile index cf6b0779..c1f27f06 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # build frontend -FROM node:18-alpine as frontend +FROM node:19-alpine as frontend ARG API_HOST ARG USE_DIST=no WORKDIR /web