From a20a544be1345cd4d7fe0d58edc09654b420e30d Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 13 Mar 2020 10:15:06 -0700 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- figma-wine/Dockerfile | 8 +++----- wine/Dockerfile | 11 +++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/figma-wine/Dockerfile b/figma-wine/Dockerfile index 0d508a5..26fe796 100644 --- a/figma-wine/Dockerfile +++ b/figma-wine/Dockerfile @@ -12,17 +12,15 @@ FROM r.j3ss.co/wine LABEL maintainer "Jessie Frazelle " -ADD https://desktop.figma.com/win/FigmaSetup.exe /usr/src/FigmaSetup.exe - ENV HOME /home/user RUN useradd --create-home --home-dir $HOME user \ - && chown -R user:user $HOME \ - && chown user:user /usr/src/FigmaSetup.exe + && curl -sSL "https://desktop.figma.com/win/FigmaSetup.exe" > ${HOME}/FigmaSetup.exe \ + && chown -R user:user $HOME WORKDIR $HOME USER user -RUN echo "wine /usr/src/FigmaSetup.exe" > /home/user/.bash_history +RUN echo "wine runas /trustlevel:0x20000 FigmaSetup.exe" > /home/user/.bash_history RUN echo "winetricks dotnet45" >> /home/user/.bash_history RUN echo "winecfg" >> /home/user/.bash_history diff --git a/wine/Dockerfile b/wine/Dockerfile index 08a26b8..848599f 100644 --- a/wine/Dockerfile +++ b/wine/Dockerfile @@ -5,18 +5,21 @@ LABEL maintainer "Jessie Frazelle " # install wine RUN echo "deb http://deb.debian.org/debian sid main contrib" > /etc/apt/sources.list \ && apt-get update && apt-get install -y \ + apt-transport-https \ cabextract \ ca-certificates \ + curl \ + gnupg2 \ fonts-wine \ - wine \ winetricks \ --no-install-recommends && \ - dpkg --add-architecture i386 && \ + curl -sSL "https://dl.winehq.org/wine-builds/winehq.key" | apt-key add - \ + && echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \ + && dpkg --add-architecture i386 && \ apt-get update && \ apt-get install -y \ libwine \ - wine32 \ - wine64 \ + winehq-staging \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/*