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

update to go 1.19

Browse Source 
docker files need to be updated as go-builder is built on
golang:1.19-alpine3.16 so base image for netmaker/netclient
needs to be updated to apline3.16 as well
This commit is contained in:
Matthew R. Kasun
2022-11-10 16:06:03 -05:00
parent 31831bcedc
commit e97566f069
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/buildandrelease.yml vendored
View File

@@ -57,7 +57,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
env CGO_ENABLED=1 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
@@ -86,7 +86,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build cli - name: Build cli
run: | run: |
@@ -190,7 +190,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
cd netclient cd netclient
@@ -290,7 +290,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
cd netclient cd netclient
@@ -321,7 +321,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
cd netclient cd netclient
@@ -363,7 +363,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
cd netclient cd netclient
@@ -438,7 +438,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
cd netclient cd netclient
@@ -491,7 +491,7 @@ jobs:
- name: Setup go - name: Setup go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.18 go-version: 1.19
- name: Mysys2 setup - name: Mysys2 setup
uses: msys2/setup-msys2@v2 uses: msys2/setup-msys2@v2
with: with:

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

@@ -13,7 +13,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
@@ -31,7 +31,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build - name: Build
run: | run: |
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
@@ -44,7 +44,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Build mac - name: Build mac
run: | run: |
env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go
@@ -56,7 +56,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: Mysys2 setup - name: Mysys2 setup
uses: msys2/setup-msys2@v2 uses: msys2/setup-msys2@v2
with: with:
@@ -76,7 +76,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18 go-version: 1.19
- name: run tests - name: run tests
run: | run: |
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev

2
Dockerfile
View File

@@ -9,7 +9,7 @@ ENV GO111MODULE=auto
RUN apk add git RUN apk add git
RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" . RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
# RUN go build -tags=ee . -o netmaker main.go # RUN go build -tags=ee . -o netmaker main.go
FROM alpine:3.15.2 FROM alpine:3.16.2
# add a c lib # add a c lib
RUN apk add gcompat iptables wireguard-tools RUN apk add gcompat iptables wireguard-tools

2
docker/Dockerfile-go-builder
View File

@@ -1,4 +1,4 @@
FROM golang:1.18.0-alpine3.15 FROM golang:1.19-alpine3.16
ARG version ARG version
RUN apk add build-base RUN apk add build-base
WORKDIR /app WORKDIR /app

2
docker/Dockerfile-netclient-doks
View File

@@ -3,7 +3,7 @@ FROM debian:buster as builder
RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz RUN wget -O go.tgz https://go.dev/dl/go1.19.linux-amd64.tar.gz
RUN tar -C /usr/local -xzf go.tgz RUN tar -C /usr/local -xzf go.tgz

2
docker/Dockerfile-netclient-doks-uspace
View File

@@ -3,7 +3,7 @@ FROM debian:buster as builder
RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz RUN wget -O go.tgz https://go.dev/dl/go1.19.linux-amd64.tar.gz
RUN tar -C /usr/local -xzf go.tgz RUN tar -C /usr/local -xzf go.tgz

2
docker/Dockerfile-netclient-multiarch
View File

@@ -9,7 +9,7 @@ ENV GO111MODULE=auto
RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-X 'main.version=${version}'" -o netclient-app netclient/main.go RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-X 'main.version=${version}'" -o netclient-app netclient/main.go
FROM alpine:3.15.2 FROM alpine:3.16.2
WORKDIR /root/ WORKDIR /root/

2
docker/Dockerfile-netclient-multiarch-userspace
View File

@@ -24,7 +24,7 @@ RUN git clone https://git.zx2c4.com/wireguard-tools && \
make && \ make && \
make install make install
FROM alpine:3.13.6 FROM alpine:3.16.2
WORKDIR /root/ WORKDIR /root/

2
go.mod
View File

@@ -1,6 +1,6 @@
module github.com/gravitl/netmaker module github.com/gravitl/netmaker
go 1.18 go 1.19
require ( require (
github.com/eclipse/paho.mqtt.golang v1.4.2 github.com/eclipse/paho.mqtt.golang v1.4.2