Merge branch 'master' into native-embed

# Conflicts:
#	Dockerfile
#	handler/routes.go
#	main.go
#	router/router.go
#	util/util.go
This commit is contained in:
ByteDream 2023-03-15 23:07:40 +01:00
commit 8f8b41dd70
31 changed files with 1181 additions and 175 deletions

View file

@ -4,6 +4,7 @@ LABEL maintainer="Khanh Ngo <k@ndk.name"
ARG TARGETOS=linux
ARG TARGETARCH=amd64
ARG COMMIT=
ARG BUILD_DEPENDENCIES="npm \
yarn"
@ -49,7 +50,7 @@ COPY . /build
RUN cp -r /build/custom/ assets/
# Build
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o wg-ui .
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X main.gitCommit=${COMMIT}" -a -o wg-ui .
# Release stage
FROM alpine:3.16