From 5383996a911eec2df0c6e34f22eaeddfbf52a2f7 Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Thu, 10 Nov 2022 10:52:44 -0500 Subject: [PATCH 1/5] add ee build to docker-publish workflow and ... updated actions to latest versions --- .github/workflows/buildandrelease.yml | 16 ++-- .github/workflows/docker-builder.yml | 6 +- .github/workflows/publish-docker.yml | 94 +++++++++---------- .../publish-netclient-docker-userspace.yml | 8 +- .../workflows/publish-netclient-docker.yml | 8 +- .github/workflows/purgeGHCR.yml | 2 +- .github/workflows/test.yml | 10 +- 7 files changed, 69 insertions(+), 75 deletions(-) diff --git a/.github/workflows/buildandrelease.yml b/.github/workflows/buildandrelease.yml index eb4a3ac0..89724d50 100644 --- a/.github/workflows/buildandrelease.yml +++ b/.github/workflows/buildandrelease.yml @@ -53,7 +53,7 @@ jobs: echo "NETMAKER_VERSION=${TAG}" >> $GITHUB_ENV echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup go uses: actions/setup-go@v2 with: @@ -76,7 +76,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -180,7 +180,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -280,7 +280,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -311,7 +311,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -353,7 +353,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -428,7 +428,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} @@ -480,7 +480,7 @@ jobs: needs: version steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Variables run: | TAG=${{needs.version.outputs.tag}} diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml index 90677b59..c5164a63 100644 --- a/.github/workflows/docker-builder.yml +++ b/.github/workflows/docker-builder.yml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: SetUp Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Dockerhub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 21b7986c..55da5bde 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -26,70 +26,64 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build x86 and export to Docker - uses: docker/build-push-action@v2 - with: - context: . - load: true - platforms: linux/amd64 - tags: ${{ env.TAG }} - build-args: version=${{ env.TAG }} - - - name: Test x86 - run: | - docker run --rm ${{ env.TAG }}& - sleep 10 - kill %1 - - - name: Build arm64 and export to Docker - uses: docker/build-push-action@v2 - with: - context: . - load: true - platforms: linux/arm64 - tags: ${{ env.TAG }} - build-args: version=${{ env.TAG }} - - - name: Test arm64 - run: | - docker run --rm ${{ env.TAG }}& - sleep 10 - kill %1 - - - name: Build armv7l and export to Docker - uses: docker/build-push-action@v2 - with: - context: . - load: true - platforms: linux/arm/v7 - tags: ${{ env.TAG }} - build-args: version=${{ env.TAG }} - - - name: Test armv7l - run: | - docker run --rm ${{ env.TAG }}& - sleep 10 - kill %1 - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . platforms: linux/amd64, linux/arm64, linux/arm/v7 push: true tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest build-args: version=${{ env.TAG }} + + docker-ee: + runs-on: ubuntu-latest + steps: + - + name: Set tag + run: | + if [[ -n "${{ github.event.inputs.tag }}" ]]; then + TAG=${{ github.event.inputs.tag }} + elif [[ "${{ github.ref_name }}" == 'master' ]]; then + TAG="latest" + else + TAG="${{ github.ref_name }}" + fi + echo "TAG=${TAG}" >> $GITHUB_ENV + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v3 + with: + context: . + platforms: linux/amd64, linux/arm64, linux/arm/v7 + push: true + tags: ${{ github.repository }}:${{ env.TAG }}-ee + build-args: version=${{ env.TAG }}, tags="-tags=ee" diff --git a/.github/workflows/publish-netclient-docker-userspace.yml b/.github/workflows/publish-netclient-docker-userspace.yml index eef20ea6..b0dc7c4b 100644 --- a/.github/workflows/publish-netclient-docker-userspace.yml +++ b/.github/workflows/publish-netclient-docker-userspace.yml @@ -26,16 +26,16 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/publish-netclient-docker.yml b/.github/workflows/publish-netclient-docker.yml index 02f7edcb..5dbd0319 100644 --- a/.github/workflows/publish-netclient-docker.yml +++ b/.github/workflows/publish-netclient-docker.yml @@ -26,16 +26,16 @@ jobs: echo "TAG=${TAG}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/purgeGHCR.yml b/.github/workflows/purgeGHCR.yml index 590a858f..09edb8ba 100644 --- a/.github/workflows/purgeGHCR.yml +++ b/.github/workflows/purgeGHCR.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prune Netmaker uses: vlaurin/action-ghcr-prune@main with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3c75861..4685294b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 with: @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 with: @@ -40,7 +40,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 with: @@ -52,7 +52,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 with: @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v2 with: From bde928e1546f54615940886d723fc3dd8ac2bab2 Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Tue, 29 Nov 2022 15:13:20 -0500 Subject: [PATCH 2/5] update workflows to match develop --- .github/workflows/buildandrelease.yml | 81 +++++++++++++++---- .github/workflows/docker-builder.yml | 2 +- .github/workflows/publish-docker.yml | 4 +- .../publish-netclient-docker-userspace.yml | 6 +- .../workflows/publish-netclient-docker.yml | 8 +- .github/workflows/test.yml | 20 ++--- 6 files changed, 87 insertions(+), 34 deletions(-) diff --git a/.github/workflows/buildandrelease.yml b/.github/workflows/buildandrelease.yml index 89724d50..7d323d33 100644 --- a/.github/workflows/buildandrelease.yml +++ b/.github/workflows/buildandrelease.yml @@ -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 @@ -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: | @@ -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 @@ -290,22 +290,53 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Build run: | cd netclient - 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=linux GOARCH=mipsle go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mipsle/netclient-mipsle main.go && upx -o build/netclient-mipsle/netclient-mipsle-upx build/netclient-mipsle/netclient-mipsle + env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mipsle/netclient-mipsle-softfloat main.go && upx -o build/netclient-mipsle/netclient-mipsle-softfloat-upx build/netclient-mipsle/netclient-mipsle-softfloat - name: Upload mipsle to Release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: netclient/build/netclient-mipsle/netclient + file: netclient/build/netclient-mipsle/netclient-mipsle tag: ${{ env.NETMAKER_VERSION }} overwrite: true prerelease: true asset_name: netclient-mipsle + - name: Upload mipsle-upx to Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: netclient/build/netclient-mipsle/netclient-mipsle-upx + tag: ${{ env.NETMAKER_VERSION }} + overwrite: true + prerelease: true + asset_name: netclient-mipsle-upx + + - name: Upload mipsle-softfloat to Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: netclient/build/netclient-mipsle/netclient-mipsle-softfloat + tag: ${{ env.NETMAKER_VERSION }} + overwrite: true + prerelease: true + asset_name: netclient-mipsle-softfloat + + - name: Upload mipsle-softfloat-upx to Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: netclient/build/netclient-mipsle/netclient-mipsle-softfloat-upx + tag: ${{ env.NETMAKER_VERSION }} + overwrite: true + prerelease: true + asset_name: netclient-mipsle-softfloat-upx + netclient-mips: runs-on: ubuntu-latest needs: version @@ -321,33 +352,53 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Build run: | cd netclient - env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mips/netclient main.go - env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mips-upx/netclient main.go && upx build/netclient-mips-upx/netclient + env CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mips/netclient-mips main.go && upx -o build/netclient-mips/netclient-mips-upx build/netclient-mips/netclient-mips + env CGO_ENABLED=0 GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mips/netclient-mips-softfloat main.go && upx -o build/netclient-mips/netclient-mips-softfloat-upx build/netclient-mips/netclient-mips-softfloat - name: Upload mips to Release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: netclient/build/netclient-mips/netclient + file: netclient/build/netclient-mips/netclient-mips tag: ${{ env.NETMAKER_VERSION }} overwrite: true prerelease: true asset_name: netclient-mips - - name: Upload upx compressed version of mips to Release + - name: Upload mips-upx to Release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: netclient/build/netclient-mips-upx/netclient + file: netclient/build/netclient-mips/netclient-mips-upx tag: ${{ env.NETMAKER_VERSION }} overwrite: true prerelease: true asset_name: netclient-mips-upx + - name: Upload netclient-mips-softfloat to Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: netclient/build/netclient-mips/netclient-mips-softfloat + tag: ${{ env.NETMAKER_VERSION }} + overwrite: true + prerelease: true + asset_name: netclient-mips-softfloat + + - name: Upload netclient-mips-softfloat-upx to Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: netclient/build/netclient-mips/netclient-mips-softfloat-upx + tag: ${{ env.NETMAKER_VERSION }} + overwrite: true + prerelease: true + asset_name: netclient-mips-softfloat-upx + netclient-freebsd: runs-on: ubuntu-latest needs: version @@ -363,7 +414,7 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Build run: | cd netclient @@ -438,7 +489,7 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Build run: | cd netclient @@ -491,7 +542,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: diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml index c5164a63..1377e609 100644 --- a/.github/workflows/docker-builder.yml +++ b/.github/workflows/docker-builder.yml @@ -19,7 +19,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push to docker hub - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: true diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 55da5bde..e3b6361e 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -71,7 +71,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/build-push-action@v3 - name: Login to DockerHub uses: docker/login-action@v2 @@ -86,4 +86,4 @@ jobs: platforms: linux/amd64, linux/arm64, linux/arm/v7 push: true tags: ${{ github.repository }}:${{ env.TAG }}-ee - build-args: version=${{ env.TAG }}, tags="-tags=ee" + build-args: version=${{ env.TAG }}, tags="-tags=ee" diff --git a/.github/workflows/publish-netclient-docker-userspace.yml b/.github/workflows/publish-netclient-docker-userspace.yml index b0dc7c4b..73957ee2 100644 --- a/.github/workflows/publish-netclient-docker-userspace.yml +++ b/.github/workflows/publish-netclient-docker-userspace.yml @@ -32,7 +32,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub uses: docker/login-action@v2 @@ -41,10 +41,10 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . - platforms: linux/amd64 + platforms: linux/amd64, linux/arm64, linux/arm/v7 file: ./docker/Dockerfile-netclient-multiarch-userspace push: true tags: gravitl/netclient-go:${{ env.TAG }}, gravitl/netclient-userspace:latest diff --git a/.github/workflows/publish-netclient-docker.yml b/.github/workflows/publish-netclient-docker.yml index 5dbd0319..1e416c11 100644 --- a/.github/workflows/publish-netclient-docker.yml +++ b/.github/workflows/publish-netclient-docker.yml @@ -41,7 +41,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build x86 and export to Docker - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . load: true @@ -57,7 +57,7 @@ jobs: kill %1 - name: Build arm64 and export to Docker - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . load: true @@ -73,7 +73,7 @@ jobs: kill %1 - name: Build armv7l and export to Docker - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . load: true @@ -89,7 +89,7 @@ jobs: kill %1 - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . platforms: linux/amd64, linux/arm64, linux/arm/v7 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4685294b..5929493f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 @@ -31,9 +31,10 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Build run: | + sudo apt-get update sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=gui main.go mac-gui: @@ -44,7 +45,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 @@ -56,7 +57,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: @@ -76,13 +77,14 @@ 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 - go test -p 1 ./... -v - go install honnef.co/go/tools/cmd/staticcheck@latest - { ~/go/bin/staticcheck -tags=ee ./... ; } + apt update + sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev + go test -p 1 ./... -v + go install honnef.co/go/tools/cmd/staticcheck@latest + { ~/go/bin/staticcheck -tags=ee ./... ; } env: DATABASE: sqlite CLIENT_MODE: "off" From a3ff34daf5046f0effccc90ce47e037639a0d63f Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Tue, 29 Nov 2022 15:15:39 -0500 Subject: [PATCH 3/5] use sudo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5929493f..b0b4fff0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,7 +80,7 @@ jobs: go-version: 1.19 - name: run tests run: | - apt update + sudo apt update sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev go test -p 1 ./... -v go install honnef.co/go/tools/cmd/staticcheck@latest From 011257eef723199794dc36e0bfd1bb831e54f782 Mon Sep 17 00:00:00 2001 From: Matthew R Kasun Date: Fri, 2 Dec 2022 11:26:37 -0500 Subject: [PATCH 4/5] Update Dockerfile-go-builder --- docker/Dockerfile-go-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-go-builder b/docker/Dockerfile-go-builder index f98268e1..a65d2498 100644 --- a/docker/Dockerfile-go-builder +++ b/docker/Dockerfile-go-builder @@ -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 From 1e76131672ff0fa66aa9ee47b371fdc8942946dc Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Fri, 2 Dec 2022 14:33:14 -0500 Subject: [PATCH 5/5] rm arch from dockerfile --- docker/Dockerfile-netclient-multiarch-userspace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-netclient-multiarch-userspace b/docker/Dockerfile-netclient-multiarch-userspace index e26c988d..1e342908 100644 --- a/docker/Dockerfile-netclient-multiarch-userspace +++ b/docker/Dockerfile-netclient-multiarch-userspace @@ -6,7 +6,7 @@ COPY . . ENV GO111MODULE=auto -RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go +RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go WORKDIR /root/