gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-08 07:41:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #866 from gravitl/develop

Browse source 
Develop
This commit is contained in:
Alex Feiszli 2022-03-07 09:44:07 -05:00 • committed by GitHub
commit 688f04cc94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/buildandrelease.yml vendored
View file

@ -33,14 +33,14 @@ jobs:
- name: Build
run: |
env GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
cd netclient
env GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient main.go
env GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm5/netclient main.go
env GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm6/netclient main.go
env GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm7/netclient main.go
env GOOS=linux GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm64/netclient main.go
env GOOS=linux GOARCH=mipsle go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mipsle/netclient main.go && upx build/netclient-mipsle/netclient
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm5/netclient main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm6/netclient main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm7/netclient main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm64/netclient main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mipsle/netclient main.go && upx build/netclient-mipsle/netclient
env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags="-X 'main.Version=${NETMAKER_VERSION}'" -o build/netclient-freebsd/netclient main.go
env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm5/netclient main.go
env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm6/netclient main.go

4
.github/workflows/test-artifacts.yml vendored
View file

@ -74,7 +74,7 @@ jobs:
- name: build client
run: |
cd netclient
go build -ldflags="-X 'main.version=testing'" -o build/netclient
env CGO_ENABLED=0 go build -ldflags="-X 'main.version=testing'" -o build/netclient
- name: deploy
uses: mdallasanta/ssh-scp-deploy@v1.1.0
with:
@ -100,7 +100,7 @@ jobs:
go-version: 1.17
- name: build server
run:
go build -ldflags="-X 'main.version=testing'" -o build/netmaker
env CGO_ENABLED=1 go build -ldflags="-X 'main.version=testing'" -o build/netmaker
- name: deploy
uses: mdallasanta/ssh-scp-deploy@v1.1.0
with:

10
.github/workflows/test.yml vendored
View file

@ -15,12 +15,12 @@ jobs:
go-version: 1.17
- name: Build
run: |
env GOOS=linux GOARCH=amd64 go build main.go
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
cd netclient
env GOOS=linux GOARCH=amd64 go build main.go
env GOOS=freebsd GOARCH=amd64 go build main.go
env GOOS=darwin GOARCH=amd64 go build main.go
env GOOS=windows GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build main.go
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build main.go
tests:
env:
DATABASE: sqlite

2
README.md
View file

@ -8,7 +8,7 @@
<p align="center">
<a href="https://github.com/gravitl/netmaker/releases">
<img src="https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square" />
<img src="https://img.shields.io/badge/Version-0.11.1-informational?style=flat-square" />
</a>
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker" />

4
compose/docker-compose.contained.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes:
- dnsconfig:/root/config/dnsconfig
- sqldata:/root/data
@ -45,7 +45,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:v0.11.0
image: gravitl/netmaker-ui:v0.11.1
links:
- "netmaker:api"
ports:

4
compose/docker-compose.hostnetwork.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes:
- dnsconfig:/root/config/dnsconfig
- /usr/bin/wg:/usr/bin/wg
@ -41,7 +41,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:0.11.0
image: gravitl/netmaker-ui:0.11.1
links:
- "netmaker:api"
ports:

4
compose/docker-compose.nocaddy.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes:
- dnsconfig:/root/config/dnsconfig
- sqldata:/root/data
@ -45,7 +45,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:v0.11.0
image: gravitl/netmaker-ui:v0.11.1
links:
- "netmaker:api"
ports:

4
compose/docker-compose.nodns.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes:
- dnsconfig:/root/config/dnsconfig
- sqldata:/root/data
@ -45,7 +45,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:v0.11.0
image: gravitl/netmaker-ui:v0.11.1
links:
- "netmaker:api"
ports:

4
compose/docker-compose.reference.yml
View file

@ -2,7 +2,7 @@ services:
netmaker: # The Primary Server for running Netmaker
privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on.
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS)
- dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
- sqldata:/root/data
@ -44,7 +44,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:v0.11.0
image: gravitl/netmaker-ui:v0.11.1
links:
- "netmaker:api"
ports:

4
compose/docker-compose.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.11.0
image: gravitl/netmaker:v0.11.1
volumes:
- dnsconfig:/root/config/dnsconfig
- sqldata:/root/data
@ -45,7 +45,7 @@ services:
container_name: netmaker-ui
depends_on:
- netmaker
image: gravitl/netmaker-ui:v0.11.0
image: gravitl/netmaker-ui:v0.11.1
links:
- "netmaker:api"
ports:

2
netclient/netclient.exe.manifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.11.0.0"
version="0.11.1.0"
processorArchitecture="*"
name="netclient.exe"
type="win32"

2
netclient/versioninfo.json
View file

@ -29,7 +29,7 @@
"OriginalFilename": "",
"PrivateBuild": "",
"ProductName": "Netclient",
"ProductVersion": "v0.11.0.0",
"ProductVersion": "v0.11.1.0",
"SpecialBuild": ""
},
"VarFileInfo": {

2
scripts/build-binaries.sh
View file

@ -18,4 +18,4 @@ env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=6 go build -ldflags="-X 'main.ve
env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=$VERSION'" -o build/netclient-freebsd-arm7 main.go
env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm64 go build -ldflags="-X 'main.version=$VERSION'" -o build/netclient-freebsd-arm64 main.go
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'main.version=$VERSION'" -o build/netclient-darwin main.go
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'main.version=${VERSION}'" -o build/netclient-darwin-arm64 main.go
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'main.version=${VERSION}'" -o build/netclient-darwin-arm64 main.go

1
scripts/netclient-install.ps1
View file

@ -30,6 +30,7 @@ new-module -name netclient-install -scriptblock {
If(-Not $installed) {
Quit "Could not install WireGuard"
} else {
$env:Path += (";" + $env:ProgramFiles + "\WireGuard")
Write-Host "'$software' is installed."
}
} else {