Skip to content

Commit

Permalink
change vr image to ubuntu (works now), build it in ci
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Detjens <[email protected]>
  • Loading branch information
detjensrobert committed Sep 20, 2024
1 parent e9ab32e commit dd97525
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
matrix:
tag:
- zed
- vr

steps:
- name: Checkout repository
Expand Down
11 changes: 8 additions & 3 deletions ubuntu/Containerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
FROM quay.io/toolbx/ubuntu-toolbox:24.04

RUN echo "en_US.UTF-8" > /etc/locale.gen

RUN apt-get update

RUN apt-get install -y apt-file && \
apt-file update

COPY ./packages /
RUN apt-get update && \
apt-get install -y $(cat /packages | grep -v '#' | xargs) && \
rm -rd /var/lib/apt/lists/* && rm /packages
RUN apt-get install -y $(cat /packages | grep -v '#' | xargs) && rm /packages

# fix bat program name
RUN ln -s /usr/bin/batcat /usr/bin/bat
Expand Down
38 changes: 30 additions & 8 deletions vr/Containerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
FROM ghcr.io/detjensrobert/toolbx-images:fedora
FROM ghcr.io/detjensrobert/toolbx-images:ubuntu


RUN sudo dpkg --add-architecture i386 && \
apt-get update -y && \
apt-get install -y steam-installer steam-devices pipewire pipewire-pulse libnss3

# steam is not in PATH by default
RUN ln -s /usr/games/steam /usr/bin/steam

# steam also expectes pkexec, sudo is passwordless here so use that instead
RUN ln -s /usr/bin/sudo /usr/bin/pkexec

RUN dnf install -y steam
# fetch latest ALVR release tarball from ALVR repo
# already structured like a package so unpack over root
# (normally dangerous but this is a container! who cares!)
RUN curl -sSL https://github.com/alvr-org/ALVR/releases/download/v20.11.0/alvr_streamer_linux.tar.gz | \
tar xzvf - \
--no-same-owner --no-same-permissions \
--keep-directory-symlink \
# RUN curl -sSL https://github.com/alvr-org/ALVR/releases/download/v20.11.0/alvr_streamer_linux.tar.gz | \
# tar xzvf - \
# --no-same-owner --no-same-permissions \
# --keep-directory-symlink \
# --strip-components 1 \
# --directory /

# fetch latest ALVR launcher release tarball
RUN curl -sSL https://github.com/alvr-org/ALVR/releases/download/v20.11.0/alvr_launcher_linux.tar.gz \
| tar xzvf - \
--strip-components 1 \
--directory /
--transform 's/ALVR Launcher/alvr_launcher/' \
--show-transformed-names \
--directory /usr/local/bin/

# use upstream alvr desktop file
RUN curl -sSL https://github.com/alvr-org/ALVR/raw/master/alvr/xtask/resources/alvr.desktop \
--output /usr/share/applications/alvr.desktop
| sed -E 's/Exec=.+/Exec=alvr_launcher/' \
> /usr/share/applications/alvr.desktop

# remove host xdg-open link so steam:// urls open inside the container
RUN rm /usr/local/bin/xdg-open

0 comments on commit dd97525

Please sign in to comment.