From c8532ebe53003c3f83b2993a571f63288be9d59e Mon Sep 17 00:00:00 2001
From: nightnoryu <qazwf734@gmail.com>
Date: Mon, 29 Jul 2024 00:31:33 +0300
Subject: [PATCH] Tweak docker files for deployment

---
 .dockerignore                |  4 ++++
 docker-compose.yml           |  2 +-
 docker/Dockerfile            | 16 +++++++---------
 docker/Dockerfile-local      | 12 ++++++++++++
 pkg/infrastructure/botapi.go |  3 ++-
 5 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 docker/Dockerfile-local

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ed6142f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+bin
+docker
+docker-compose.yml
+*.env
diff --git a/docker-compose.yml b/docker-compose.yml
index b934e5d..71256f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     container_name: anon3anon
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: docker/Dockerfile-local
     volumes:
       - "./bin:/app/bin"
     env_file: .env
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4bbe441..74a85cd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,10 @@
-FROM debian:11-slim
-RUN apt-get update && \
-    apt-get install -y --no-install-suggests --no-install-recommends ca-certificates && \
-    apt-get install -y curl && \
-    apt-get clean && \
-    groupadd -g 1001 serviceuser && \
-    useradd -u 1001 -r -g 1001 -s /sbin/nologin -c "go service user" serviceuser
+FROM golang:1.22.5
 
-ADD /bin/anon3anon /app/bin/anon3anon
 WORKDIR /app
 
-CMD [ "/app/bin/anon3anon" ]
+COPY . .
+
+RUN go mod download
+RUN CGO_ENABLED=0 GOOS=linux go build -o /app/bin/anon3anon ./cmd/anon3anon
+
+CMD ["/app/bin/anon3anon"]
diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
new file mode 100644
index 0000000..4bbe441
--- /dev/null
+++ b/docker/Dockerfile-local
@@ -0,0 +1,12 @@
+FROM debian:11-slim
+RUN apt-get update && \
+    apt-get install -y --no-install-suggests --no-install-recommends ca-certificates && \
+    apt-get install -y curl && \
+    apt-get clean && \
+    groupadd -g 1001 serviceuser && \
+    useradd -u 1001 -r -g 1001 -s /sbin/nologin -c "go service user" serviceuser
+
+ADD /bin/anon3anon /app/bin/anon3anon
+WORKDIR /app
+
+CMD [ "/app/bin/anon3anon" ]
diff --git a/pkg/infrastructure/botapi.go b/pkg/infrastructure/botapi.go
index e3cd35f..643f224 100644
--- a/pkg/infrastructure/botapi.go
+++ b/pkg/infrastructure/botapi.go
@@ -11,8 +11,9 @@ import (
 
 const (
 	updateTimeoutInSeconds = 60
-	startCommand           = "/start"
 	messageParseMode       = tgbotapi.ModeMarkdown
+
+	startCommand = "start"
 )
 
 type fileInfo struct {