From 3dddd23dbda240ccaba2c317656926a2af763057 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sun, 15 Sep 2019 13:43:31 -0600 Subject: [PATCH 1/3] linux-clang-format, frozen: add p7zip-full --- linux-clang-format/Dockerfile | 2 +- linux-frozen/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index c8a4a55..06caa81 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,4 +1,4 @@ FROM ubuntu:18.04 LABEL maintainer="citraemu" RUN apt-get update && apt-get -y full-upgrade -RUN apt-get install -y git clang-format-6.0 +RUN apt-get install -y git clang-format-6.0 p7zip-full diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index 435b2b1..ecd316a 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 LABEL maintainer="citraemu" RUN mkdir -p /tmp/pkgs COPY install_package.py /tmp/pkgs -RUN apt-get update && apt-get install -y build-essential wget git python-launchpadlib ccache ninja-build +RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python-launchpadlib ccache ninja-build RUN cd /tmp/pkgs && python2 install_package.py \ libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \ qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \ From ea3e2431bab577fce8d1b938d40d17cbc6b3dd41 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 2 Dec 2019 17:34:42 -0700 Subject: [PATCH 2/3] linux-transifex: use Debian base image --- linux-transifex/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile index a8bc8d1..f884454 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine +FROM debian:buster-slim LABEL maintainer="citraemu" -RUN apk update && apk add build-base cmake python3-dev qt5-qttools-dev qt5-qtmultimedia-dev +RUN apt-get update && apt-get -y full-upgrade +RUN apt-get install -y p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake RUN pip3 install transifex-client From 7e6e5bca1829617cce28ce127b7636235f7ce1a2 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 2 Dec 2019 17:35:28 -0700 Subject: [PATCH 3/3] linux-flatpak: update KDE SDK to 5.13 --- linux-flatpak/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index f6115fa..c93a07d 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -3,4 +3,4 @@ LABEL maintainer="citraemu" RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y p7zip-full wget git flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2 sudo RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo -RUN flatpak install -y flathub org.kde.Platform//5.12 org.kde.Sdk//5.12 +RUN flatpak install -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13