diff --git a/dockerfile b/dockerfile index 54cd6cc..baa977f 100644 --- a/dockerfile +++ b/dockerfile @@ -9,38 +9,13 @@ RUN apt -y update RUN install -d -m 0755 /etc/apt/keyrings RUN apt -y install wget gpg dbus-x11 -#RUN wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null -#RUN gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); if($0 == "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3") print "\nThe key fingerprint matches ("$0").\n"; else print "\nVerification failed: the fingerprint ("$0") does not match the expected one.\n"}' -#RUN echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null +RUN wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null +RUN gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); if($0 == "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3") print "\nThe key fingerprint matches ("$0").\n"; else print "\nVerification failed: the fingerprint ("$0") does not match the expected one.\n"}' +RUN echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null RUN apt -y update -#RUN apt -y install firefox +RUN apt -y install firefox -################################################### -####### install gnome-mahjongg -################################################### -#RUN apt -y install gnome-mahjongg - - -################################################### -# wiithon install steps -################################################### - -#RUN grep "deb http://ppa.launchpad.net/wii.sceners.linux/wiithon-1.1/ubuntu karmic main" /etc/apt/sources.list -#RUN echo deb http://ppa.launchpad.net/wii.sceners.linux/wiithon-1.1/ubuntu karmic main | tee -a /etc/apt/sources.list -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1F882273 -#RUN apt-get update -#RUN apt-get install wiithon -#RUN gpasswd -a $USER disk - -################################################### -# wine install steps -################################################### -RUN dpkg --add-architecture i386 -RUN apt -y update -RUN apt -y install wine wine64 libwine fonts-wine -COPY . . - ################################################### ######## Graphic settings ################################################### @@ -48,6 +23,4 @@ RUN dbus-uuidgen > /etc/machine-id RUN export DISPLAY=0:0 #run it -CMD /usr/bin/wine microsoft-teams.exe -#CMD /usr/bin/firefox -#CMD /usr/games/gnome-mahjongg +CMD /usr/bin/firefox