From 4234b7e7bcd00e562d30e7d10b3f6aa69fa10efa Mon Sep 17 00:00:00 2001
From: atridadl <me@atri.dad>
Date: Tue, 9 Jan 2024 16:52:43 -0700
Subject: [PATCH] Dockerfile fix

---
 Dockerfile | 15 ++++++---------
 go.mod     |  6 +++---
 go.sum     |  4 ++++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3adbdc4..0c682ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
-FROM golang:1.21.5
+FROM golang:1.21.6 as build
 
 WORKDIR /app
 
-ADD . /lib
-
-COPY go.mod .
-COPY go.sum .
-COPY main.go .
+COPY . .
 
 RUN go mod download
+RUN CGO_ENABLED=0 go build -o /go/bin/app
 
-COPY ./lib ./lib
+FROM gcr.io/distroless/base-debian12
 
-RUN go build .
+COPY --from=build /go/bin/app /
 
-CMD [ "./himbot" ]
\ No newline at end of file
+CMD [ "/app" ]
diff --git a/go.mod b/go.mod
index 39fd624..db78ec4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
 module himbot
 
-go 1.21.5
+go 1.21.6
 
 require github.com/diamondburned/arikawa/v3 v3.3.4
 
 require (
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 )
 
@@ -14,6 +14,6 @@ require (
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/joho/godotenv v1.5.1
 	github.com/replicate/replicate-go v0.14.2
-	github.com/sashabaranov/go-openai v1.17.10
+	github.com/sashabaranov/go-openai v1.17.11
 	golang.org/x/time v0.5.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 5509175..33ace0a 100644
--- a/go.sum
+++ b/go.sum
@@ -16,6 +16,8 @@ github.com/replicate/replicate-go v0.14.2 h1:XgK+REvYrWs7qDeyugxHA93h31qBhEFk/3p
 github.com/replicate/replicate-go v0.14.2/go.mod h1:otIrl1vDmyjNhTzmVmp/mQU3Wt1+3387gFNEsAZq0ig=
 github.com/sashabaranov/go-openai v1.17.10 h1:ybvWN+d/rgEK/64U6dsjnOQ9AUya2wBoJKj3Wuaonqo=
 github.com/sashabaranov/go-openai v1.17.10/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.17.11 h1:XVr00J8JymJVx8Hjbh/5mG0V4PQHRarBU3v7k2x6MR0=
+github.com/sashabaranov/go-openai v1.17.11/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -29,6 +31,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=