Merge pull request #4 from Tech-Preta/snyk-fix-995e892adde4ef6aa295f1…

…6e17e678c2 [Snyk] Security upgrade golang from 1.23rc2 to 1.23.1
Tech-Preta · Sep 9, 2024 · 12b6c6a · 12b6c6a
2 parents fe7afbd + 5e046c2
commit 12b6c6a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,11 @@
 # Use the official Golang image to create a build artifact.
 # This is based on Debian and sets the GOPATH to /go.
+<<<<<<< HEAD
+FROM golang:1.23.1 as builder
+=======
 FROM FROM golang:1.23.1 as builder
 
+>>>>>>> main
 
 # Copy local code to the container image.
 WORKDIR /go/src/projeto