Add docker image build scripts
This commit is contained in:
71
Dockerfile
Normal file
71
Dockerfile
Normal file
@@ -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"]
|
28
Taskfile.yml
Normal file
28
Taskfile.yml
Normal file
@@ -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}}'
|
@@ -8,6 +8,10 @@ force_shutdown_timeout = 20
|
|||||||
[database]
|
[database]
|
||||||
path = "data/transcriber.db"
|
path = "data/transcriber.db"
|
||||||
|
|
||||||
|
# File storage configuration
|
||||||
|
[storage]
|
||||||
|
path = "data/files"
|
||||||
|
|
||||||
# Yandex Cloud Configuration
|
# Yandex Cloud Configuration
|
||||||
[yandex]
|
[yandex]
|
||||||
# ID папки в Yandex Cloud (получить в консоли Yandex Cloud)
|
# ID папки в Yandex Cloud (получить в консоли Yandex Cloud)
|
||||||
|
41
docker/entrypoint.sh
Executable file
41
docker/entrypoint.sh
Executable file
@@ -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
|
@@ -10,6 +10,7 @@ import (
|
|||||||
type Config struct {
|
type Config struct {
|
||||||
Server ServerConfig `toml:"server"`
|
Server ServerConfig `toml:"server"`
|
||||||
Database DatabaseConfig `toml:"database"`
|
Database DatabaseConfig `toml:"database"`
|
||||||
|
Storage StorageConfig `toml:"storage"`
|
||||||
Yandex YandexConfig `toml:"yandex"`
|
Yandex YandexConfig `toml:"yandex"`
|
||||||
Telegram TelegramConfig `toml:"telegram"`
|
Telegram TelegramConfig `toml:"telegram"`
|
||||||
}
|
}
|
||||||
@@ -25,6 +26,10 @@ type DatabaseConfig struct {
|
|||||||
Path string `toml:"path"`
|
Path string `toml:"path"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type StorageConfig struct {
|
||||||
|
Path string `toml:"path"`
|
||||||
|
}
|
||||||
|
|
||||||
type YandexConfig struct {
|
type YandexConfig struct {
|
||||||
FolderID string `toml:"folder_id"`
|
FolderID string `toml:"folder_id"`
|
||||||
SpeechKitAPIKey string `toml:"speech_kit_api_key"`
|
SpeechKitAPIKey string `toml:"speech_kit_api_key"`
|
||||||
@@ -51,6 +56,9 @@ func DefaultConfig() *Config {
|
|||||||
Database: DatabaseConfig{
|
Database: DatabaseConfig{
|
||||||
Path: "data/transcriber.db",
|
Path: "data/transcriber.db",
|
||||||
},
|
},
|
||||||
|
Storage: StorageConfig{
|
||||||
|
Path: "data/files",
|
||||||
|
},
|
||||||
Yandex: YandexConfig{
|
Yandex: YandexConfig{
|
||||||
FolderID: "",
|
FolderID: "",
|
||||||
SpeechKitAPIKey: "",
|
SpeechKitAPIKey: "",
|
||||||
|
@@ -69,7 +69,7 @@ func setupTestRouter(t *testing.T) (*gin.Engine, *TranscribeHandler) {
|
|||||||
Level: slog.LevelError, // Только ошибки в тестах
|
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)
|
handler := NewTranscribeHandler(jobRepo, trsService)
|
||||||
|
|
||||||
|
@@ -17,8 +17,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
baseStorageDir = "data/files"
|
|
||||||
|
|
||||||
defaultAudioExt = "audio"
|
defaultAudioExt = "audio"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -28,6 +26,7 @@ type TranscribeService struct {
|
|||||||
metaviewer contract.AudioMetaViewer
|
metaviewer contract.AudioMetaViewer
|
||||||
converter contract.AudioFileConverter
|
converter contract.AudioFileConverter
|
||||||
recognizer contract.AudioRecognizer
|
recognizer contract.AudioRecognizer
|
||||||
|
storagePath string
|
||||||
logger *slog.Logger
|
logger *slog.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,6 +36,7 @@ func NewTranscribeService(
|
|||||||
metaviewer contract.AudioMetaViewer,
|
metaviewer contract.AudioMetaViewer,
|
||||||
converter contract.AudioFileConverter,
|
converter contract.AudioFileConverter,
|
||||||
recognizer contract.AudioRecognizer,
|
recognizer contract.AudioRecognizer,
|
||||||
|
storagePath string,
|
||||||
logger *slog.Logger,
|
logger *slog.Logger,
|
||||||
) *TranscribeService {
|
) *TranscribeService {
|
||||||
return &TranscribeService{
|
return &TranscribeService{
|
||||||
@@ -45,6 +45,7 @@ func NewTranscribeService(
|
|||||||
metaviewer: metaviewer,
|
metaviewer: metaviewer,
|
||||||
converter: converter,
|
converter: converter,
|
||||||
recognizer: recognizer,
|
recognizer: recognizer,
|
||||||
|
storagePath: storagePath,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -61,7 +62,7 @@ func (s *TranscribeService) CreateTranscribeJob(file io.Reader, fileName string)
|
|||||||
|
|
||||||
// Создаем путь для сохранения файла
|
// Создаем путь для сохранения файла
|
||||||
storageFileName := fmt.Sprintf("%s%s", fileId, ext)
|
storageFileName := fmt.Sprintf("%s%s", fileId, ext)
|
||||||
storageFilePath := filepath.Join(baseStorageDir, storageFileName)
|
storageFilePath := filepath.Join(s.storagePath, storageFileName)
|
||||||
|
|
||||||
s.logger.Info("Creating transcribe job",
|
s.logger.Info("Creating transcribe job",
|
||||||
"file_id", fileId,
|
"file_id", fileId,
|
||||||
@@ -161,11 +162,11 @@ func (s *TranscribeService) FindAndRunConversionJob() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
srcFilePath := filepath.Join(baseStorageDir, srcFile.FileName)
|
srcFilePath := filepath.Join(s.storagePath, srcFile.FileName)
|
||||||
|
|
||||||
destFileId := uuid.NewString()
|
destFileId := uuid.NewString()
|
||||||
destFileName := fmt.Sprintf("%s%s", destFileId, ".ogg")
|
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), ".")
|
srcExt := strings.TrimPrefix(filepath.Ext(srcFile.FileName), ".")
|
||||||
@@ -260,7 +261,7 @@ func (s *TranscribeService) FindAndRunTranscribeJob() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
filePath := filepath.Join(baseStorageDir, fileRecord.FileName)
|
filePath := filepath.Join(s.storagePath, fileRecord.FileName)
|
||||||
|
|
||||||
file, err := os.Open(filePath)
|
file, err := os.Open(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
10
main.go
10
main.go
@@ -115,7 +115,15 @@ func main() {
|
|||||||
defer recognizer.Close()
|
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
|
// Создаем контекст для graceful shutdown
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
Reference in New Issue
Block a user