Merge branch 'main' into twitch-streams

livekit · Jul 19, 2024 · a4d2ebe · a4d2ebe
2 parents c355670 + 40456a4
commit a4d2ebe
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/publish-chrome.yaml b/.github/workflows/publish-chrome.yaml
@@ -136,7 +136,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./build/chrome
           file: ./build/chrome/Dockerfile

diff --git a/.github/workflows/publish-egress.yaml b/.github/workflows/publish-egress.yaml
@@ -66,7 +66,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./build/egress/Dockerfile

diff --git a/.github/workflows/publish-gstreamer-base.yaml b/.github/workflows/publish-gstreamer-base.yaml
@@ -37,7 +37,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push base
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./build/gstreamer
           push: true
@@ -48,7 +48,7 @@ jobs:
           tags: livekit/gstreamer:${{ env.GST_VERSION }}-base-${{ inputs.arch }}
 
       - name: Build and push dev
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./build/gstreamer
           push: true
@@ -59,7 +59,7 @@ jobs:
           tags: livekit/gstreamer:${{ env.GST_VERSION }}-dev-${{ inputs.arch }}
 
       - name: Build and push prod
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./build/gstreamer
           push: true
@@ -70,7 +70,7 @@ jobs:
           tags: livekit/gstreamer:${{ env.GST_VERSION }}-prod-${{ inputs.arch }}
 
       - name: Build and push prod RS
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./build/gstreamer
           push: true

diff --git a/.github/workflows/publish-template.yaml b/.github/workflows/publish-template.yaml
@@ -46,7 +46,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./build/template/Dockerfile

diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml
@@ -80,7 +80,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./build/test/Dockerfile

diff --git a/build/chrome/Dockerfile b/build/chrome/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN mkdir /chrome-installer
 COPY output/arm64 /chrome-installer/arm64

diff --git a/build/egress/Dockerfile b/build/egress/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM livekit/gstreamer:1.22.12-dev
+FROM livekit/gstreamer:1.24.4-dev
 
 ARG TARGETPLATFORM
 ARG TARGETARCH
@@ -51,7 +51,7 @@ ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
 RUN chmod +x /tini
 
-FROM livekit/gstreamer:1.22.12-prod
+FROM livekit/gstreamer:1.24.4-prod
 
 ARG TARGETPLATFORM
 

diff --git a/build/gstreamer/Dockerfile-base b/build/gstreamer/Dockerfile-base
@@ -1,4 +1,4 @@
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 ARG GSTREAMER_VERSION
 

diff --git a/build/gstreamer/Dockerfile-dev b/build/gstreamer/Dockerfile-dev
@@ -11,7 +11,7 @@ COPY compile-rs /
 RUN /compile
 RUN /compile-rs
 
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 COPY install-dependencies /
 

diff --git a/build/gstreamer/Dockerfile-prod b/build/gstreamer/Dockerfile-prod
@@ -9,7 +9,7 @@ COPY compile /
 
 RUN /compile
 
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \

diff --git a/build/template/Dockerfile b/build/template/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 WORKDIR /workspace