chore: fix conflicts

Signed-off-by: Leonardo Di Donato <[email protected]>
iovisor · Oct 27, 2020 · 400eb18 · 400eb18
2 parents 1f1c09e + de43b67
commit 400eb18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.15
       - name: Install goreleaser
         run: |
           curl -LO https://github.com/goreleaser/goreleaser/releases/latest/download/goreleaser_amd64.deb && \

diff --git a/build/Dockerfile.tracerunner b/build/Dockerfile.tracerunner
@@ -1,9 +1,10 @@
 ARG bpftraceversion=v0.11.1
 FROM quay.io/iovisor/bpftrace:$bpftraceversion as bpftrace
 
-FROM golang:1.11.4-stretch as gobuilder
+FROM golang:1.15-buster as gobuilder
 ARG GIT_ORG=iovisor
 ENV GIT_ORG=$GIT_ORG
+
 RUN apt-get update
 RUN apt-get install -y make bash git