Skip to content

Commit 885caf7

Browse files
authored
Moved browser to chromium and changed base runner image to support arm builds (#18)
1 parent 3788cec commit 885caf7

3 files changed

Lines changed: 12 additions & 17 deletions

File tree

.github/workflows/edge.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
name: Build Edge Image
1616
runs-on: ubuntu-latest
1717
steps:
18+
- name: Set up QEMU
19+
uses: docker/setup-qemu-action@v3
20+
1821
- name: Set up Docker Buildx
1922
uses: docker/setup-buildx-action@v3
2023

@@ -42,7 +45,7 @@ jobs:
4245
uses: docker/build-push-action@v6
4346
with:
4447
push: true
45-
platforms: linux/amd64
48+
platforms: linux/amd64,linux/arm64
4649
context: .
4750
tags: ${{ steps.meta.outputs.tags }}
4851
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
- name: Checkout
3434
uses: actions/checkout@v5
3535

36+
- name: Set up QEMU
37+
uses: docker/setup-qemu-action@v3
38+
3639
- name: Set up Docker Buildx
3740
uses: docker/setup-buildx-action@v3
3841

@@ -90,7 +93,7 @@ jobs:
9093
uses: docker/build-push-action@v6
9194
with:
9295
push: true
93-
platforms: linux/amd64
96+
platforms: linux/amd64,linux/arm64
9497
context: .
9598
tags: ${{ steps.meta.outputs.tags }}
9699
labels: ${{ steps.meta.outputs.labels }}

Dockerfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ FROM golang:1.25.0 AS base
1212
FROM base AS builder
1313
RUN go build -o /stream ./cmd/main.go
1414

15-
# Download Chrome in a separate stage so it's done parallel to the rest of the build
16-
FROM curlimages/curl:latest AS downloader
17-
RUN curl -fsSL https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
18-
-o google-chrome-stable_current_amd64.deb
19-
20-
# Run using FFmpeg image with Chrome support
21-
FROM linuxserver/ffmpeg:7.1.1 AS runner
22-
# Install runtime dependencies
15+
# Run using Chromium image with FFmpeg support
16+
FROM linuxserver/chromium:latest AS runner
17+
# Install FFmpeg and runtime dependencies
2318
RUN apt-get update && apt-get install -y \
19+
ffmpeg \
2420
xvfb \
2521
x11-utils \
2622
pulseaudio \
@@ -30,13 +26,6 @@ FROM linuxserver/ffmpeg:7.1.1 AS runner
3026
dbus \
3127
&& rm -rf /var/lib/apt/lists/*
3228

33-
# Install Chrome from downloaded .deb
34-
COPY --from=downloader /home/curl_user/google-chrome-stable_current_amd64.deb /tmp/google-chrome-stable_current_amd64.deb
35-
RUN apt-get update \
36-
&& apt-get install -y /tmp/google-chrome-stable_current_amd64.deb \
37-
&& rm /tmp/google-chrome-stable_current_amd64.deb \
38-
&& rm -rf /var/lib/apt/lists/*
39-
4029
# Create directories for audio configs
4130
RUN mkdir -p /root/.config/pulse /var/run/pulse /var/run/dbus
4231

0 commit comments

Comments
 (0)