Skip to content

Commit 688f04c

Browse files
afeiszliafeiszli
authored
Merge pull request #866 from gravitl/develop
Develop
2 parents e1cb353 + 75eeb69 commit 688f04c

14 files changed

+31
-30
lines changed

‎.github/workflows/buildandrelease.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333

3434
- name: Build
3535
run: |
36-
env GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
36+
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
3737
cd netclient
38-
env GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient main.go
39-
env GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm5/netclient main.go
40-
env GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm6/netclient main.go
41-
env GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm7/netclient main.go
42-
env GOOS=linux GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm64/netclient main.go
43-
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
38+
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient main.go
39+
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
40+
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
41+
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
42+
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm64/netclient main.go
43+
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
4444
env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags="-X 'main.Version=${NETMAKER_VERSION}'" -o build/netclient-freebsd/netclient main.go
4545
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
4646
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

‎.github/workflows/test-artifacts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: build client
7575
run: |
7676
cd netclient
77-
go build -ldflags="-X 'main.version=testing'" -o build/netclient
77+
env CGO_ENABLED=0 go build -ldflags="-X 'main.version=testing'" -o build/netclient
7878
- name: deploy
7979
uses: mdallasanta/[email protected]
8080
with:
@@ -100,7 +100,7 @@ jobs:
100100
go-version: 1.17
101101
- name: build server
102102
run:
103-
go build -ldflags="-X 'main.version=testing'" -o build/netmaker
103+
env CGO_ENABLED=1 go build -ldflags="-X 'main.version=testing'" -o build/netmaker
104104
- name: deploy
105105
uses: mdallasanta/[email protected]
106106
with:

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
go-version: 1.17
1616
- name: Build
1717
run: |
18-
env GOOS=linux GOARCH=amd64 go build main.go
18+
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
1919
cd netclient
20-
env GOOS=linux GOARCH=amd64 go build main.go
21-
env GOOS=freebsd GOARCH=amd64 go build main.go
22-
env GOOS=darwin GOARCH=amd64 go build main.go
23-
env GOOS=windows GOARCH=amd64 go build main.go
20+
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build main.go
21+
env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build main.go
22+
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build main.go
23+
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build main.go
2424
tests:
2525
env:
2626
DATABASE: sqlite

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<p align="center">
1010
<a href="https://github.com/gravitl/netmaker/releases">
11-
<img src="https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square" />
11+
<img src="https://img.shields.io/badge/Version-0.11.1-informational?style=flat-square" />
1212
</a>
1313
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
1414
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker" />

‎compose/docker-compose.contained.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.11.0
6+
image: gravitl/netmaker:v0.11.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- sqldata:/root/data
@@ -45,7 +45,7 @@ services:
4545
container_name: netmaker-ui
4646
depends_on:
4747
- netmaker
48-
image: gravitl/netmaker-ui:v0.11.0
48+
image: gravitl/netmaker-ui:v0.11.1
4949
links:
5050
- "netmaker:api"
5151
ports:

‎compose/docker-compose.hostnetwork.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.11.0
6+
image: gravitl/netmaker:v0.11.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- /usr/bin/wg:/usr/bin/wg
@@ -41,7 +41,7 @@ services:
4141
container_name: netmaker-ui
4242
depends_on:
4343
- netmaker
44-
image: gravitl/netmaker-ui:0.11.0
44+
image: gravitl/netmaker-ui:0.11.1
4545
links:
4646
- "netmaker:api"
4747
ports:

‎compose/docker-compose.nocaddy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.11.0
6+
image: gravitl/netmaker:v0.11.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- sqldata:/root/data
@@ -45,7 +45,7 @@ services:
4545
container_name: netmaker-ui
4646
depends_on:
4747
- netmaker
48-
image: gravitl/netmaker-ui:v0.11.0
48+
image: gravitl/netmaker-ui:v0.11.1
4949
links:
5050
- "netmaker:api"
5151
ports:

‎compose/docker-compose.nodns.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.11.0
6+
image: gravitl/netmaker:v0.11.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- sqldata:/root/data
@@ -45,7 +45,7 @@ services:
4545
container_name: netmaker-ui
4646
depends_on:
4747
- netmaker
48-
image: gravitl/netmaker-ui:v0.11.0
48+
image: gravitl/netmaker-ui:v0.11.1
4949
links:
5050
- "netmaker:api"
5151
ports:

‎compose/docker-compose.reference.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
netmaker: # The Primary Server for running Netmaker
33
privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on.
44
container_name: netmaker
5-
image: gravitl/netmaker:v0.11.0
5+
image: gravitl/netmaker:v0.11.1
66
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)
77
- dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
88
- sqldata:/root/data
@@ -44,7 +44,7 @@ services:
4444
container_name: netmaker-ui
4545
depends_on:
4646
- netmaker
47-
image: gravitl/netmaker-ui:v0.11.0
47+
image: gravitl/netmaker-ui:v0.11.1
4848
links:
4949
- "netmaker:api"
5050
ports:

‎compose/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.11.0
6+
image: gravitl/netmaker:v0.11.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- sqldata:/root/data
@@ -45,7 +45,7 @@ services:
4545
container_name: netmaker-ui
4646
depends_on:
4747
- netmaker
48-
image: gravitl/netmaker-ui:v0.11.0
48+
image: gravitl/netmaker-ui:v0.11.1
4949
links:
5050
- "netmaker:api"
5151
ports:

0 commit comments

Comments
 (0)