From 3d96b8d0e0b8a9767699dfe6ded40859995fe1ef Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 19 Jul 2020 23:19:08 +0200 Subject: [PATCH 1/5] Update Ubuntu version to 20.04 (#25) * linux-clang-format: Update Ubuntu * linux-flatpak: Update Ubuntu * linux-fresh: Update Ubuntu * linux-frozen: Update Ubuntu * linux-mingw: Update Ubuntu --- linux-clang-format/Dockerfile | 2 +- linux-flatpak/Dockerfile | 2 +- linux-fresh/Dockerfile | 2 +- linux-frozen/Dockerfile | 2 +- linux-mingw/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 06caa81..976e317 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="citraemu" RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y git clang-format-6.0 p7zip-full diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index c93a07d..269203a 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 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 diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 7d7d4a3..c104e3f 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="citraemu" RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavfilter-dev libavformat-dev libswscale-dev wget git ccache cmake ninja-build diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index ecd316a..bed8dcd 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="citraemu" RUN mkdir -p /tmp/pkgs COPY install_package.py /tmp/pkgs diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index e8d89aa..772fcab 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="citraemu" RUN mkdir -p /tmp/pkgs 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 ninja-build From ee9aaf49ffa12c281f515624af2c0c1d1d32608c Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 21 Jul 2020 14:13:23 -0600 Subject: [PATCH 2/5] meta: add ENV DEBIAN_FRONTEND=noninteractive... ... so that apt will not ask for user input --- linux-clang-format/Dockerfile | 1 + linux-flatpak/Dockerfile | 1 + linux-fresh/Dockerfile | 1 + linux-frozen/Dockerfile | 1 + linux-mingw/Dockerfile | 1 + linux-transifex/Dockerfile | 1 + 6 files changed, 6 insertions(+) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 976e317..a0711cf 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,4 +1,5 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y git clang-format-6.0 p7zip-full diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index 269203a..4e33784 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive 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 diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index c104e3f..254cc6c 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,4 +1,5 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavfilter-dev libavformat-dev libswscale-dev wget git ccache cmake ninja-build diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index bed8dcd..9a2b0f9 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive RUN mkdir -p /tmp/pkgs COPY install_package.py /tmp/pkgs RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python-launchpadlib ccache ninja-build diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index 772fcab..5c44250 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive RUN mkdir -p /tmp/pkgs 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 ninja-build # workaround broken headers in Ubuntu MinGW package diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile index f884454..9100521 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -1,5 +1,6 @@ FROM debian:buster-slim LABEL maintainer="citraemu" +ENV DEBIAN_FRONTEND=noninteractive 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 8cf77e38eb2074d2faf4544cff8a9619e6f46e5f Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 3 Aug 2020 14:56:13 -0600 Subject: [PATCH 3/5] linux-transifex: add missing git dependency --- linux-transifex/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-transifex/Dockerfile b/linux-transifex/Dockerfile index 9100521..81d4a04 100644 --- a/linux-transifex/Dockerfile +++ b/linux-transifex/Dockerfile @@ -2,5 +2,5 @@ FROM debian:buster-slim LABEL maintainer="citraemu" ENV DEBIAN_FRONTEND=noninteractive 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 apt-get install -y git p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake RUN pip3 install transifex-client From 189b8a2e9b15a05f8fbc9601825aea9f7adf9005 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 3 Aug 2020 15:22:16 -0600 Subject: [PATCH 4/5] linux-frozen: re-freezing dependencies to Ubuntu 20.04 --- linux-frozen/Dockerfile | 26 +++++++++++++------------- linux-frozen/install_package.py | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index 9a2b0f9..043beaf 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -3,17 +3,17 @@ LABEL maintainer="citraemu" ENV DEBIAN_FRONTEND=noninteractive RUN mkdir -p /tmp/pkgs COPY install_package.py /tmp/pkgs -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 \ - libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \ - qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \ - qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ - qtmultimedia5-dev 5.9.3-0ubuntu3 bionic \ - libicu57 57.1-6ubuntu0.2 bionic \ - cmake 3.10.2-1ubuntu2 bionic \ - libavcodec-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \ - libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \ - libswscale-dev 7:3.4.4-0ubuntu0.18.04.1 bionic +RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python3-launchpadlib ccache ninja-build +RUN cd /tmp/pkgs && python3 install_package.py \ + libsdl2-dev 2.0.10+dfsg1-3 focal \ + qtbase5-dev 5.12.8+dfsg-0ubuntu1 focal \ + libqt5opengl5-dev 5.12.8+dfsg-0ubuntu1 focal \ + qt5-qmltooling-plugins 5.12.8-0ubuntu1 focal \ + qtdeclarative5-dev 5.12.8-0ubuntu1 focal \ + qtmultimedia5-dev 5.12.8-0ubuntu1 focal \ + libicu66 66.1-2ubuntu2 focal \ + cmake 3.16.3-1ubuntu1 focal \ + libavcodec-dev 7:4.2.4-1ubuntu0.1 focal \ + libavformat-dev 7:4.2.4-1ubuntu0.1 focal \ + libswscale-dev 7:4.2.4-1ubuntu0.1 focal RUN rm -rf /tmp/pkgs diff --git a/linux-frozen/install_package.py b/linux-frozen/install_package.py index 50473c2..fd884a6 100755 --- a/linux-frozen/install_package.py +++ b/linux-frozen/install_package.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys import re @@ -27,8 +27,8 @@ def get_url(pkg, distro): def list_dependencies(deb_file): t = subprocess.check_output( - ['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\: \K.*$") || true'.format(deb_file)]) - deps = [i.split('|')[0].strip() for i in t.split(',')] + ['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\\: \\K.*$") || true'.format(deb_file)]) + deps = [i.split(b'|')[0].decode('utf-8').strip() for i in t.split(b',')] equals_re = re.compile(r'^(.*) \(= (.*)\)$') return [equals_re.sub(r'\1=\2', i).split('=') for i in filter(equals_re.match, deps)] From 167b154ec7dbc7817be60661f6f21fe825d56e67 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 8 Aug 2020 18:45:43 +0200 Subject: [PATCH 5/5] linux-clang-format: Make use of clang-format 10 This plays nicer with C++ attributes and is also more up to date. --- linux-clang-format/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index a0711cf..ba02ba6 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -2,4 +2,4 @@ FROM ubuntu:20.04 LABEL maintainer="citraemu" ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -y full-upgrade -RUN apt-get install -y git clang-format-6.0 p7zip-full +RUN apt-get install -y git clang-format-10.0 p7zip-full