From 5012df1bdf1339c28dc638f057e500837abb480a Mon Sep 17 00:00:00 2001 From: streamer45 Date: Tue, 14 Nov 2023 13:48:20 -0600 Subject: [PATCH 1/3] Update transcriber --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 0688bb1..57293c4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mattermost/calls-offloader -go 1.21.3 +go 1.21.4 require ( git.mills.io/prologic/bitcask v1.0.2 @@ -10,7 +10,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/mattermost/calls-recorder v0.5.3-0.20231101214409-5a6468bf48ac - github.com/mattermost/calls-transcriber v0.0.0-20231101215444-1872330b226c + github.com/mattermost/calls-transcriber v0.0.0-20231114192409-72f23a5ac871 github.com/mattermost/mattermost/server/public v0.0.6 github.com/pborman/uuid v1.2.1 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 6b0477a..70a5e45 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattermost/calls-recorder v0.5.3-0.20231101214409-5a6468bf48ac h1:2ZOtwlmw/TJ9KAam3qYgc5n/NUxGrJBKzAxBW9fZ70E= github.com/mattermost/calls-recorder v0.5.3-0.20231101214409-5a6468bf48ac/go.mod h1:s74AtCBI2tw5vcf2GJKh94G1+CVtSClbFQV+cnXm/VM= -github.com/mattermost/calls-transcriber v0.0.0-20231101215444-1872330b226c h1:8XqQ3hM0gieEdfEygcSw3Evy1DJBzqlA3HqTT1taznQ= -github.com/mattermost/calls-transcriber v0.0.0-20231101215444-1872330b226c/go.mod h1:dyHfyHL8WzWTmApWgDBuCDXdMg/OC3XSu+k+DMoX3HA= +github.com/mattermost/calls-transcriber v0.0.0-20231114192409-72f23a5ac871 h1:SgCLpfsrx8dIaotLnWq/kDYaNdz5i/yhSQpjlCsUHEc= +github.com/mattermost/calls-transcriber v0.0.0-20231114192409-72f23a5ac871/go.mod h1:m9TjBxBNHUo/kXyeXzGrWVjR32bmikKuuLLq6fXI6J8= github.com/mattermost/logr/v2 v2.0.16 h1:jnePX4cPskC3WDFvUardh/xZfxNdsFXbEERJQ1kUEDE= github.com/mattermost/logr/v2 v2.0.16/go.mod h1:1dm/YhTpozsqANXxo5Pi5zYLBsal2xY0pX+JZNbzYJY= github.com/mattermost/mattermost/server/public v0.0.6 h1:FUaJ+P36E3Tt12Umdm8p1h7sZNUeObDk3p3aFTaBkCo= From 0a912cdbc43208f96fd608fd394c777c88e7aee4 Mon Sep 17 00:00:00 2001 From: streamer45 Date: Tue, 14 Nov 2023 14:17:16 -0600 Subject: [PATCH 2/3] Don't set defaults --- service/docker/service.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/docker/service.go b/service/docker/service.go index f27d254..7e15432 100644 --- a/service/docker/service.go +++ b/service/docker/service.go @@ -279,14 +279,12 @@ func (s *JobService) CreateJob(cfg job.Config, onStopCb job.StopCb) (job.Job, er case job.TypeRecording: var jobData recorder.RecorderConfig jobData.FromMap(cfg.InputData) - jobData.SetDefaults() jobData.SiteURL = getSiteURLForJob(jobData.SiteURL) jobPrefix = recordingJobPrefix env = append(env, jobData.ToEnv()...) case job.TypeTranscribing: var jobData transcriber.CallTranscriberConfig jobData.FromMap(cfg.InputData) - jobData.SetDefaults() jobData.SiteURL = getSiteURLForJob(jobData.SiteURL) jobPrefix = transcribingJobPrefix env = append(env, jobData.ToEnv()...) From 2681948229542f1de636e26bc8e4ed059d8d559e Mon Sep 17 00:00:00 2001 From: streamer45 Date: Tue, 14 Nov 2023 16:56:49 -0600 Subject: [PATCH 3/3] Update Go image --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2038449..4c5d2d6 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ DOCKER_REGISTRY_REPO ?= mattermost/${APP_NAME}-daily DOCKER_USER ?= user DOCKER_PASSWORD ?= password ## Docker Images -DOCKER_IMAGE_GO += "golang:${GO_VERSION}@sha256:3ce8313c3513515040870c55e0c041a2b94f3576a58cfd3948633604214aa811" +DOCKER_IMAGE_GO += "golang:${GO_VERSION}@sha256:337543447173c2238c78d4851456760dcc57c1dfa8c3bcd94cbee8b0f7b32ad0" DOCKER_IMAGE_GOLINT += "golangci/golangci-lint:v1.54.2@sha256:abe731fe6bb335a30eab303a41dd5c2b630bb174372a4da08e3d42eab5324127" DOCKER_IMAGE_DOCKERLINT += "hadolint/hadolint:v2.9.2@sha256:d355bd7df747a0f124f3b5e7b21e9dafd0cb19732a276f901f0fdee243ec1f3b" DOCKER_IMAGE_COSIGN += "bitnami/cosign:1.8.0@sha256:8c2c61c546258fffff18b47bb82a65af6142007306b737129a7bd5429d53629a"