diff --git a/docker-compose.build.yml b/docker-compose.build.yml index dcc6f582..ef919785 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -19,7 +19,8 @@ services: build: ./back restart: on-failure environment: - - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666} + - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video} + - KYOO_PREFIX=/api env_file: - ./.env depends_on: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index cec50d1c..88d10383 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -29,7 +29,8 @@ services: - "5000:5000" restart: on-failure environment: - - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666} + - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video} + - KYOO_PREFIX=/api env_file: - ./.env depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 9c13db06..8ede436e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,8 @@ services: restart: unless-stopped cpus: 1.5 environment: - - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666} + - TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video} + - KYOO_PREFIX=/api env_file: - ./.env depends_on: diff --git a/transcoder/main.go b/transcoder/main.go index ae3aa715..6965d91b 100644 --- a/transcoder/main.go +++ b/transcoder/main.go @@ -308,18 +308,19 @@ func main() { metadata: metadata, } - e.GET("/:path/direct", DirectStream) - e.GET("/:path/direct/:identifier", DirectStream) - e.GET("/:path/master.m3u8", h.GetMaster) - e.GET("/:path/:video/:quality/index.m3u8", h.GetVideoIndex) - e.GET("/:path/audio/:audio/index.m3u8", h.GetAudioIndex) - e.GET("/:path/:video/:quality/:chunk", h.GetVideoSegment) - e.GET("/:path/audio/:audio/:chunk", h.GetAudioSegment) - e.GET("/:path/info", h.GetInfo) - e.GET("/:path/thumbnails.png", h.GetThumbnails) - e.GET("/:path/thumbnails.vtt", h.GetThumbnailsVtt) - e.GET("/:path/attachment/:name", h.GetAttachment) - e.GET("/:path/subtitle/:name", h.GetSubtitle) + g := e.Group(src.Settings.RoutePrefix) + g.GET("/:path/direct", DirectStream) + g.GET("/:path/direct/:identifier", DirectStream) + g.GET("/:path/master.m3u8", h.GetMaster) + g.GET("/:path/:video/:quality/index.m3u8", h.GetVideoIndex) + g.GET("/:path/audio/:audio/index.m3u8", h.GetAudioIndex) + g.GET("/:path/:video/:quality/:chunk", h.GetVideoSegment) + g.GET("/:path/audio/:audio/:chunk", h.GetAudioSegment) + g.GET("/:path/info", h.GetInfo) + g.GET("/:path/thumbnails.png", h.GetThumbnails) + g.GET("/:path/thumbnails.vtt", h.GetThumbnailsVtt) + g.GET("/:path/attachment/:name", h.GetAttachment) + g.GET("/:path/subtitle/:name", h.GetSubtitle) e.Logger.Fatal(e.Start(":7666")) }