diff --git a/receivers/electron/.gitlab-ci.yml b/receivers/electron/.gitlab-ci.yml index 1f94669..3bf51d6 100644 --- a/receivers/electron/.gitlab-ci.yml +++ b/receivers/electron/.gitlab-ci.yml @@ -36,7 +36,7 @@ buildMac: buildWindowsAndLinux: stage: buildAndDeployElectron - image: gitlab.futo.org:5050/videostreaming/fcast/receiver-electron-dev + image: gitlab.futo.org:5050/videostreaming/fcast/receiver-electron-dev:latest tags: - fcast before_script: diff --git a/receivers/electron/Dockerfile b/receivers/electron/Dockerfile index 8bbe20f..58982b5 100644 --- a/receivers/electron/Dockerfile +++ b/receivers/electron/Dockerfile @@ -6,16 +6,11 @@ RUN apt update && apt install -y zip dpkg fakeroot rpm wget p7zip-full unzip RUN mkdir -pm755 /etc/apt/keyrings RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources +RUN echo "deb http://deb.debian.org/debian bookworm main contrib non-free" > /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free" >> /etc/apt/sources.list -RUN apt update && apt install -y --install-recommends winehq-staging mono-devel - -RUN wget https://github.com/PietJankbal/Chocolatey-for-wine/releases/download/v0.5a.745/Chocolatey-for-wine.7z -RUN 7za x Chocolatey-for-wine.7z -RUN wine Chocolatey-for-wine/ChoCinstaller_0.5a.745.exe - -# Issues building in docker... -# RUN wine choco install wixtoolset --version=3.14.1 -# ENV WINEPATH="/root/.wine/drive_c/Program Files (x86)/WiX Toolset v3.14/bin/" +RUN apt update && apt install -y --install-recommends winehq-stable mono-devel winetricks +RUN winetricks -q -f dotnet45 RUN wget https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip RUN unzip wix314-binaries.zip -d wix314-binaries