From ccadba44f5817b55fafa776f905612fc2ee372ea Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 13 Jul 2021 23:23:48 -0600 Subject: [PATCH] linux-fresh: update base image to use Qt 5.15 ... ... other images replaced MAINTAINER with LABEL --- linux-clang-format/Dockerfile | 2 +- linux-flatpak/Dockerfile | 4 ++-- linux-fresh/Dockerfile | 2 +- linux-mingw/Dockerfile | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 028b0c0..7ef60f8 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:20.04 -MAINTAINER yuzu +LABEL maintainer="yuzu" # Create a user account yuzu (UID 1027) that the container will run as RUN useradd -m -u 1027 -s /bin/bash yuzu && \ apt-get update && apt-get -y full-upgrade && \ diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index 7e9c203..b315da4 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:20.04 -MAINTAINER yuzu +LABEL maintainer="yuzu" RUN useradd -m -u 1027 -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get -y full-upgrade \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -12,5 +12,5 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-g sshfs fuse elfutils \ && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log \ && flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \ - && flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13 + && flatpak install -v -y flathub org.kde.Platform//5.15 org.kde.Sdk//5.15 USER 1027 diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 1dc8022..70944ed 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -MAINTAINER yuzu +LABEL maintainer="yuzu" ENV CLANG_VER=12 ENV CMAKE_VER=3.16.3 diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index ad1fce1..e635daa 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,8 +1,7 @@ FROM archlinux:latest -MAINTAINER yuzu +LABEL maintainer="yuzu" ENV EXT_BIN_URL="https://github.com/yuzu-emu/ext-linux-bin/raw/main/mingw" - # Workaround for Arch Linux Docker image failing to build # From https://stackoverflow.com/questions/66154574 RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \