deploy service

Author: sxwebdev

.gitignore

@@ -36,6 +36,7 @@ _test
 
 ./start*
 .env
+deploy.env
 .netrc
 
 ./config

Makefile

@@ -27,10 +27,10 @@ genproto:
 
 # Docker
 docker-build:
-	docker build -t ${docker_repo}:dev .
+	docker build -t ${docker_repo}:latest .
 
-push-dev: docker-build
-	docker push ${docker_repo}:dev
+docker-push: docker-build
+	docker push ${docker_repo}:latest
 	docker image prune -f
 
 # Infrasctructure

README.md

@@ -2,6 +2,8 @@
 
 This bot downloads media files from Instagram and YouTube and uploads them to the telegram bot
 
+Try to chek it: [@mxsaverbot](https://t.me/mxsaverbot)
+
 ## Environment variables
 
 Environment variables are [here](https://github.com/sxwebdev/downloaderbot/blob/master/ENVS.md)
@@ -34,6 +36,7 @@ S3_BASE_URL=
 - [x] Dockerfile
 - [x] Docker compose
 - [x] S3 File storage (used for inline bot)
+- [x] Proxy server for youtube filelinks
 
 ```bash
 # start service

docker-compose.deploy.yml

@@ -0,0 +1,46 @@
+version: "3.9"
+
+networks:
+  downloaderbot_net:
+    driver: bridge
+    name: downloaderbot_net
+
+volumes:
+  minio-data-1:
+  minio-data-2:
+
+services:
+  # downloaderbot
+  downloaderbot:
+    image: ${DOCKER_REPO}
+    networks:
+      - downloaderbot_net
+    ports:
+      - 9085:9000
+    depends_on:
+      - redis
+    environment:
+      - ENV_CI=${ENV_CI}
+      - TELEGRAM_BOT_API_TOKEN=${TELEGRAM_BOT_API_TOKEN}
+      - LIMITER_CACHE_PREFIX=${LIMITER_CACHE_PREFIX}
+      - REDIS_ADDR=redis:6379
+      - S3_ACCESS_ID=${S3_ACCESS_ID}
+      - S3_SECRET_KEY=${S3_SECRET_KEY}
+      - S3_REGION=${S3_REGION}
+      - S3_ENDPOINT=${S3_ENDPOINT}
+      - S3_BASE_URL=${S3_BASE_URL}
+      - S3_BUCKET_NAME=downloaderbot
+    restart: on-failure
+
+  # redis
+  redis:
+    image: "redis:latest"
+    restart: on-failure
+    command: ["redis-server", "--bind", "redis", "--port", "6379"]
+    networks:
+      - downloaderbot_net
+    ports:
+      - "${REDIS_PORT}:6379"
+    volumes:
+      - ./config/redis/redis-data:/var/lib/redis
+      - ./config/redis/redis.conf:/usr/local/etc/redis/redis.conf

internal/services/parser/get_media.go

@@ -129,7 +129,7 @@ func (s *Service) saveMediaData(ctx context.Context, media *models.Media) error
 		// use file from storage if it esists
 		if exists {
 			// get public file url
-			fileUrl, err := url.JoinPath(s.config.S3BaseUrl, s.config.S3.BucketName, fileName)
+			fileUrl, err := url.JoinPath(s.config.S3BaseUrl, fileName)
 			if err != nil {
 				return err
 			}
@@ -152,7 +152,7 @@ func (s *Service) saveMediaData(ctx context.Context, media *models.Media) error
 		}
 
 		// get public file url
-		fileUrl, err := url.JoinPath(s.config.S3BaseUrl, s.config.S3.BucketName, filePath)
+		fileUrl, err := url.JoinPath(s.config.S3BaseUrl, filePath)
 		if err != nil {
 			return err
 		}