diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..586e61e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,71 @@ +# Build stage +FROM docker.io/library/golang:1.24-alpine AS build-env + +# Install build dependencies +RUN apk --no-cache add \ + build-base \ + && rm -rf /var/cache/apk/* + +# Set up the working directory +WORKDIR /app + +# Copy go mod files +COPY go.mod go.sum ./ + +# Download dependencies +RUN go mod download + +# Copy source code +COPY . . + +# Build the application +RUN CGO_ENABLED=0 go build -tags sqlite_allow_null_time -o transcriber . + +# ---------------- +# Production stage +# ---------------- + +FROM docker.io/library/alpine:latest + +LABEL maintainer="anton@vakhrushev.me" + +# Install runtime dependencies +RUN apk --no-cache add \ + ca-certificates \ + ffmpeg \ + && rm -rf /var/cache/apk/* + +# Create user and group +RUN addgroup -S -g 1000 transcriber && \ + adduser -S -H -D \ + -h /data/transcriber \ + -s /bin/sh \ + -u 1000 \ + -G transcriber \ + transcriber + +# Set environment variables +ENV USER=transcriber + +# Create necessary directories +RUN mkdir -p /data && chown -R transcriber:transcriber /data +RUN mkdir -p /config && chown -R transcriber:transcriber /config + +# Set working directory +WORKDIR /app + +# Copy the binary from build stage +COPY --from=build-env /app/transcriber . + +# Copy entrypoint script +COPY docker/entrypoint.sh /usr/bin/entrypoint +RUN chmod 755 /usr/bin/entrypoint + +# Set user +USER transcriber + +EXPOSE 8080 + +# Set entrypoint and default command +ENTRYPOINT ["/usr/bin/entrypoint"] +CMD ["./transcriber"] diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000..cb67082 --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,28 @@ +# https://taskfile.dev + +version: '3' + +vars: + GREETING: Hello, World! + +tasks: + + deploy: + vars: + COMMIT_HASH: + sh: git rev-parse --short HEAD + TIMESTAMP: + sh: date +%s + DOCKER_IMAGE: transcriber:{{.COMMIT_HASH}}-{{.TIMESTAMP}} + cmds: + - docker build --pull --file Dockerfile --tag {{.DOCKER_IMAGE}} . + # - task: deploy-with-ansible + # vars: + # DOCKER_IMAGE: '{{.DOCKER_IMAGE}}' + + deploy-with-ansible: + internal: true + requires: + vars: [DOCKER_IMAGE] + dir: '/home/av/projects/private/pet-project-server' + cmd: ansible-playbook -i production.yml playbook-transcriber.yml --tag=deploy --extra-vars 'transcriber_image={{.DOCKER_IMAGE}}' \ No newline at end of file diff --git a/config.dist.toml b/config.dist.toml index 9fb1c67..6b3a373 100644 --- a/config.dist.toml +++ b/config.dist.toml @@ -8,6 +8,10 @@ force_shutdown_timeout = 20 [database] path = "data/transcriber.db" +# File storage configuration +[storage] +path = "data/files" + # Yandex Cloud Configuration [yandex] # ID папки в Yandex Cloud (получить в консоли Yandex Cloud) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100755 index 0000000..ac372e7 --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +# Protect against buggy runc in docker <20.10.6 causing problems in with Alpine >= 3.14 +if [ ! -x /bin/sh ]; then + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Gitea. You must upgrade Docker."; + exit 1; +fi + +if [ "${USER}" != "transcriber" ]; then + # Rename user + sed -i -e "s/^transcriber\:/${USER}\:/g" /etc/passwd +fi + +if [ -z "${USER_GID}" ]; then + USER_GID="$(id -g ${USER})" +fi + +if [ -z "${USER_UID}" ]; then + USER_UID="$(id -u ${USER})" +fi + +# Change GID for USER? +if [ -n "${USER_GID}" ] && [ "${USER_GID}" != "$(id -g ${USER})" ]; then + sed -i -e "s/^${USER}:\([^:]*\):[0-9]*/${USER}:\1:${USER_GID}/" /etc/group + sed -i -e "s/^${USER}:\([^:]*\):\([0-9]*\):[0-9]*/${USER}:\1:\2:${USER_GID}/" /etc/passwd +fi + +# Change UID for USER? +if [ -n "${USER_UID}" ] && [ "${USER_UID}" != "$(id -u ${USER})" ]; then + sed -i -e "s/^${USER}:\([^:]*\):[0-9]*:\([0-9]*\)/${USER}:\1:${USER_UID}:\2/" /etc/passwd +fi + +for FOLDER in /data /config; do + mkdir -p ${FOLDER} +done + +if [ $# -gt 0 ]; then + exec "$@" +else + exec ./transcriber +fi diff --git a/internal/config/config.go b/internal/config/config.go index 57597bc..33831d2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,6 +10,7 @@ import ( type Config struct { Server ServerConfig `toml:"server"` Database DatabaseConfig `toml:"database"` + Storage StorageConfig `toml:"storage"` Yandex YandexConfig `toml:"yandex"` Telegram TelegramConfig `toml:"telegram"` } @@ -25,6 +26,10 @@ type DatabaseConfig struct { Path string `toml:"path"` } +type StorageConfig struct { + Path string `toml:"path"` +} + type YandexConfig struct { FolderID string `toml:"folder_id"` SpeechKitAPIKey string `toml:"speech_kit_api_key"` @@ -51,6 +56,9 @@ func DefaultConfig() *Config { Database: DatabaseConfig{ Path: "data/transcriber.db", }, + Storage: StorageConfig{ + Path: "data/files", + }, Yandex: YandexConfig{ FolderID: "", SpeechKitAPIKey: "", diff --git a/internal/controller/http/transcribe_test.go b/internal/controller/http/transcribe_test.go index 0f1b1ff..8014522 100644 --- a/internal/controller/http/transcribe_test.go +++ b/internal/controller/http/transcribe_test.go @@ -69,7 +69,7 @@ func setupTestRouter(t *testing.T) (*gin.Engine, *TranscribeHandler) { Level: slog.LevelError, // Только ошибки в тестах })) - trsService := service.NewTranscribeService(jobRepo, fileRepo, metaviewer, converter, recognizer, logger) + trsService := service.NewTranscribeService(jobRepo, fileRepo, metaviewer, converter, recognizer, "data/files", logger) handler := NewTranscribeHandler(jobRepo, trsService) diff --git a/internal/service/transcribe.go b/internal/service/transcribe.go index 95a5db1..5629c8b 100644 --- a/internal/service/transcribe.go +++ b/internal/service/transcribe.go @@ -17,18 +17,17 @@ import ( ) const ( - baseStorageDir = "data/files" - defaultAudioExt = "audio" ) type TranscribeService struct { - jobRepo contract.TranscriptJobRepository - fileRepo contract.FileRepository - metaviewer contract.AudioMetaViewer - converter contract.AudioFileConverter - recognizer contract.AudioRecognizer - logger *slog.Logger + jobRepo contract.TranscriptJobRepository + fileRepo contract.FileRepository + metaviewer contract.AudioMetaViewer + converter contract.AudioFileConverter + recognizer contract.AudioRecognizer + storagePath string + logger *slog.Logger } func NewTranscribeService( @@ -37,15 +36,17 @@ func NewTranscribeService( metaviewer contract.AudioMetaViewer, converter contract.AudioFileConverter, recognizer contract.AudioRecognizer, + storagePath string, logger *slog.Logger, ) *TranscribeService { return &TranscribeService{ - jobRepo: jobRepo, - fileRepo: fileRepo, - metaviewer: metaviewer, - converter: converter, - recognizer: recognizer, - logger: logger, + jobRepo: jobRepo, + fileRepo: fileRepo, + metaviewer: metaviewer, + converter: converter, + recognizer: recognizer, + storagePath: storagePath, + logger: logger, } } @@ -61,7 +62,7 @@ func (s *TranscribeService) CreateTranscribeJob(file io.Reader, fileName string) // Создаем путь для сохранения файла storageFileName := fmt.Sprintf("%s%s", fileId, ext) - storageFilePath := filepath.Join(baseStorageDir, storageFileName) + storageFilePath := filepath.Join(s.storagePath, storageFileName) s.logger.Info("Creating transcribe job", "file_id", fileId, @@ -161,11 +162,11 @@ func (s *TranscribeService) FindAndRunConversionJob() error { return err } - srcFilePath := filepath.Join(baseStorageDir, srcFile.FileName) + srcFilePath := filepath.Join(s.storagePath, srcFile.FileName) destFileId := uuid.NewString() destFileName := fmt.Sprintf("%s%s", destFileId, ".ogg") - destFilePath := filepath.Join(baseStorageDir, destFileName) + destFilePath := filepath.Join(s.storagePath, destFileName) // Получаем расширение исходного файла для метрики srcExt := strings.TrimPrefix(filepath.Ext(srcFile.FileName), ".") @@ -260,7 +261,7 @@ func (s *TranscribeService) FindAndRunTranscribeJob() error { return err } - filePath := filepath.Join(baseStorageDir, fileRecord.FileName) + filePath := filepath.Join(s.storagePath, fileRecord.FileName) file, err := os.Open(filePath) if err != nil { diff --git a/main.go b/main.go index c528992..f3fbb1f 100644 --- a/main.go +++ b/main.go @@ -115,7 +115,15 @@ func main() { defer recognizer.Close() // Создаем сервисы - transcribeService := service.NewTranscribeService(jobRepo, fileRepo, metaviewer, converter, recognizer, logger) + transcribeService := service.NewTranscribeService( + jobRepo, + fileRepo, + metaviewer, + converter, + recognizer, + cfg.Storage.Path, + logger, + ) // Создаем контекст для graceful shutdown ctx, cancel := context.WithCancel(context.Background())