Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-08-09 06:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2

Browse Source 
# Conflicts:
#	.circleci/config.yml
#	Dockerfile
#	README-RASPBERRYPI.md
#	README.md
#	assets/tpl/user_index.html
#	docker-compose.yml
#	go.mod
#	go.sum
#	internal/server/handlers_common.go
#	internal/server/routes.go
#	internal/wireguard/peermanager.go
This commit is contained in:
Christoph Haas 2023-08-03 23:07:26 +02:00
commit 6f9dc633c5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -35,4 +35,6 @@ sqlite.db
go.sum go.sum
swagger.json swagger.json
swagger.yaml swagger.yaml
/config.yml /config.yml
sqlite.db
node_modules/

4
Makefile
View File

@ -77,6 +77,7 @@ clean:
build: build-dependencies build: build-dependencies
CGO_ENABLED=1 $(GOCMD) build -o $(BUILDDIR)/wg-portal \ CGO_ENABLED=1 $(GOCMD) build -o $(BUILDDIR)/wg-portal \
-ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \ -ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \
-tags netgo \
cmd/wg-portal/main.go cmd/wg-portal/main.go
#< build-amd64: Build all executables for AMD64 #< build-amd64: Build all executables for AMD64
@ -84,6 +85,7 @@ build: build-dependencies
build-amd64: build-dependencies build-amd64: build-dependencies
CGO_ENABLED=1 $(GOCMD) build -o $(BUILDDIR)/wg-portal-amd64 \ CGO_ENABLED=1 $(GOCMD) build -o $(BUILDDIR)/wg-portal-amd64 \
-ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \ -ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \
-tags netgo \
cmd/wg-portal/main.go cmd/wg-portal/main.go
#< build-arm64: Build all executables for ARM64 #< build-arm64: Build all executables for ARM64
@ -91,6 +93,7 @@ build-amd64: build-dependencies
build-arm64: build-dependencies build-arm64: build-dependencies
CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOOS=linux GOARCH=arm64 $(GOCMD) build -o $(BUILDDIR)/wg-portal-arm64 \ CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOOS=linux GOARCH=arm64 $(GOCMD) build -o $(BUILDDIR)/wg-portal-arm64 \
-ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \ -ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \
-tags netgo \
cmd/wg-portal/main.go cmd/wg-portal/main.go
#< build-arm: Build all executables for ARM32 #< build-arm: Build all executables for ARM32
@ -98,6 +101,7 @@ build-arm64: build-dependencies
build-arm: build-dependencies build-arm: build-dependencies
CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc GOOS=linux GOARCH=arm GOARM=7 $(GOCMD) build -o $(BUILDDIR)/wg-portal-arm \ CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc GOOS=linux GOARCH=arm GOARM=7 $(GOCMD) build -o $(BUILDDIR)/wg-portal-arm \
-ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \ -ldflags "-w -s -extldflags \"-static\" -X 'github.com/h44z/wg-portal/internal/server.Version=${ENV_BUILD_IDENTIFIER}-${ENV_BUILD_VERSION}'" \
-tags netgo \
cmd/wg-portal/main.go cmd/wg-portal/main.go
#< build-dependencies: Generate the output directory for compiled executables and download dependencies #< build-dependencies: Generate the output directory for compiled executables and download dependencies