Skip to content

Commit

Permalink
update to go 1.19
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mattkasun committed Nov 10, 2022
1 parent 31831bc commit e97566f
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/buildandrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19

- name: Build cli
run: |
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
cd netclient
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
cd netclient
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
cd netclient
Expand Down Expand Up @@ -363,7 +363,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
cd netclient
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
cd netclient
Expand Down Expand Up @@ -491,7 +491,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19
- name: Mysys2 setup
uses: msys2/setup-msys2@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build
run: |
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Build mac
run: |
env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Mysys2 setup
uses: msys2/setup-msys2@v2
with:
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: run tests
run: |
sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV GO111MODULE=auto
RUN apk add git
RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
# RUN go build -tags=ee . -o netmaker main.go
FROM alpine:3.15.2
FROM alpine:3.16.2

# add a c lib
RUN apk add gcompat iptables wireguard-tools
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-go-builder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18.0-alpine3.15
FROM golang:1.19-alpine3.16
ARG version
RUN apk add build-base
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-netclient-doks
Original file line number Diff line number Diff line change
Expand Up @@ -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 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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-netclient-doks-uspace
Original file line number Diff line number Diff line change
Expand Up @@ -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 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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-netclient-multiarch
Original file line number Diff line number Diff line change
Expand Up @@ -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

FROM alpine:3.15.2
FROM alpine:3.16.2

WORKDIR /root/

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-netclient-multiarch-userspace
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN git clone https://git.zx2c4.com/wireguard-tools && \
make && \
make install

FROM alpine:3.13.6
FROM alpine:3.16.2

WORKDIR /root/

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gravitl/netmaker

go 1.18
go 1.19

require (
github.com/eclipse/paho.mqtt.golang v1.4.2
Expand Down

0 comments on commit e97566f

Please sign in to comment.