diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index c8698cd..40fe4f3 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -2,4 +2,4 @@ FROM ubuntu:18.04 MAINTAINER citra RUN useradd -m -s /bin/bash citra RUN apt-get update && apt-get -y full-upgrade -RUN apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake +RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index 84f6607..c1aa257 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -6,7 +6,6 @@ RUN apt-get update && apt-get install -y build-essential wget git python-launchp RUN cd /tmp/pkgs && python2 install_package.py \ libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \ qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \ - qttools5-dev-tools 5.9.5-0ubuntu1 bionic \ libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \ qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \ qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index cc72e49..ea99f0b 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 MAINTAINER citra RUN useradd -m -s /bin/bash citra -RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake +RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache p7zip-full g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake # workaround broken headers in Ubuntu MinGW package COPY errno.h /usr/x86_64-w64-mingw32/include/ # HACK: the repository does not contain necessary packages for 18.04, we'll use packages for 17.10 for now