From 4b459c53a9584125e9034f32297461f58ed33a27 Mon Sep 17 00:00:00 2001
From: David Colburn <xero73@gmail.com>
Date: Sun, 28 Jan 2024 11:46:48 -0800
Subject: [PATCH] go 1.21.6 (#600)

---
 .github/workflows/publish-egress.yaml |  2 +-
 build/egress/Dockerfile               |  6 +++---
 build/test/Dockerfile                 | 10 +++++-----
 go.mod                                |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish-egress.yaml b/.github/workflows/publish-egress.yaml
index 7df6d3b1..0295ebce 100644
--- a/.github/workflows/publish-egress.yaml
+++ b/.github/workflows/publish-egress.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.4
+          go-version: 1.21.6
 
       - name: Download Go modules
         run: go mod download
diff --git a/build/egress/Dockerfile b/build/egress/Dockerfile
index 488b0038..e40a2831 100644
--- a/build/egress/Dockerfile
+++ b/build/egress/Dockerfile
@@ -20,9 +20,9 @@ WORKDIR /workspace
 
 # install go
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
-    wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
+    wget https://go.dev/dl/go1.21.6.linux-${GOARCH}.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
+    tar -C /usr/local -xzf go1.21.6.linux-${GOARCH}.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
 
 
@@ -43,7 +43,7 @@ RUN find cmd/server/templates/ -name *.map | xargs rm
 
 # build
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
-    CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go build -a -o egress ./cmd/server
+    CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on GODEBUG=disablethp=1 go build -a -o egress ./cmd/server
 
 FROM livekit/gstreamer:1.22.8-prod
 
diff --git a/build/test/Dockerfile b/build/test/Dockerfile
index a7341ef9..52895504 100644
--- a/build/test/Dockerfile
+++ b/build/test/Dockerfile
@@ -20,9 +20,9 @@ ARG TARGETPLATFORM
 
 # install go
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
-    wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
+    wget https://go.dev/dl/go1.21.6.linux-${GOARCH}.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
+    tar -C /usr/local -xzf go1.21.6.linux-${GOARCH}.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
 
 # download go modules
@@ -42,7 +42,7 @@ COPY --from=livekit/egress-templates workspace/build/ test/templates/
 
 # build (service tests will need to launch the handler)
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
-    CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go build -a -o egress ./cmd/server
+    CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on GODEBUG=disablethp=1 go build -a -o egress ./cmd/server
 
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
     CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go test -c -v --tags=integration ./test
@@ -67,9 +67,9 @@ RUN apt-get update && \
 
 # install go
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \
-    wget https://go.dev/dl/go1.21.4.linux-${GOARCH}.tar.gz && \
+    wget https://go.dev/dl/go1.21.6.linux-${GOARCH}.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go1.21.4.linux-${GOARCH}.tar.gz
+    tar -C /usr/local -xzf go1.21.6.linux-${GOARCH}.tar.gz
 ENV PATH="/usr/local/go/bin:${PATH}"
 
 # install chrome
diff --git a/go.mod b/go.mod
index 8e66cbb4..b96e4ad9 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/livekit/egress
 
 go 1.21
 
-toolchain go1.21.4
+toolchain go1.21.6
 
 require (
 	cloud.google.com/go/storage v1.31.0