From ccadba44f5817b55fafa776f905612fc2ee372ea Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 13 Jul 2021 23:23:48 -0600 Subject: [PATCH 1/5] 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 && \ From 3262fbd485209c560e22a481075eabb34567fafc Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 00:06:34 -0700 Subject: [PATCH 2/5] linux-flatpak: drop ... ... in flavor of FlatHub official build --- .github/workflows/ci.yml | 2 +- linux-flatpak/Dockerfile | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 linux-flatpak/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5d4581..a6cbdd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: ["linux-clang-format", "linux-flatpak", "linux-fresh", "linux-mingw", "linux-transifex"] + image: ["linux-clang-format", "linux-fresh", "linux-mingw", "linux-transifex"] steps: - uses: actions/checkout@v2 diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile deleted file mode 100644 index b315da4..0000000 --- a/linux-flatpak/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:20.04 -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 \ - flatpak flatpak-builder \ - librsvg2-common \ - ca-certificates build-essential libsdl2-dev libssl-dev \ - python qtbase5-dev qtwebengine5-dev libqt5opengl5-dev \ - wget git ccache cmake \ - ninja-build dnsutils gnupg2 \ - 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.15 org.kde.Sdk//5.15 -USER 1027 From 01d6fed1269bdaa51a2c895edc81c73fc5fce8e4 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 00:07:48 -0700 Subject: [PATCH 3/5] linux-mingw/errno.h: remove the stale file --- linux-mingw/errno.h | 241 -------------------------------------------- 1 file changed, 241 deletions(-) delete mode 100644 linux-mingw/errno.h diff --git a/linux-mingw/errno.h b/linux-mingw/errno.h deleted file mode 100644 index 390f77c..0000000 --- a/linux-mingw/errno.h +++ /dev/null @@ -1,241 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_ERRNO -#define _INC_ERRNO - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _CRT_ERRNO_DEFINED -#define _CRT_ERRNO_DEFINED -_CRTIMP extern int *__cdecl _errno(void); -#define errno (*_errno()) - -errno_t __cdecl _set_errno(int _Value); -errno_t __cdecl _get_errno(int *_Value); -#endif /* _CRT_ERRNO_DEFINED */ - -#define EPERM 1 -#define ENOENT 2 -#define ENOFILE ENOENT -#define ESRCH 3 -#define EINTR 4 -#define EIO 5 -#define ENXIO 6 -#define E2BIG 7 -#define ENOEXEC 8 -#define EBADF 9 -#define ECHILD 10 -#define EAGAIN 11 -#define ENOMEM 12 -#define EACCES 13 -#define EFAULT 14 -#define EBUSY 16 -#define EEXIST 17 -#define EXDEV 18 -#define ENODEV 19 -#define ENOTDIR 20 -#define EISDIR 21 -#define ENFILE 23 -#define EMFILE 24 -#define ENOTTY 25 -#define EFBIG 27 -#define ENOSPC 28 -#define ESPIPE 29 -#define EROFS 30 -#define EMLINK 31 -#define EPIPE 32 -#define EDOM 33 -#define EDEADLK 36 -#define ENAMETOOLONG 38 -#define ENOLCK 39 -#define ENOSYS 40 -#define ENOTEMPTY 41 - -#ifndef RC_INVOKED -#if !defined(_SECURECRT_ERRCODE_VALUES_DEFINED) -#define _SECURECRT_ERRCODE_VALUES_DEFINED -#define EINVAL 22 -#define ERANGE 34 -#define EILSEQ 42 -#define STRUNCATE 80 -#endif -#endif - -#define EDEADLOCK EDEADLK - -/* Posix thread extensions. */ - -#ifndef ENOTSUP -#define ENOTSUP 129 -#endif - -/* Extension defined as by report VC 10+ defines error-numbers. */ - -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT 102 -#endif - -#ifndef EADDRINUSE -#define EADDRINUSE 100 -#endif - -#ifndef EADDRNOTAVAIL -#define EADDRNOTAVAIL 101 -#endif - -#ifndef EISCONN -#define EISCONN 113 -#endif - -#ifndef ENOBUFS -#define ENOBUFS 119 -#endif - -#ifndef ECONNABORTED -#define ECONNABORTED 106 -#endif - -#ifndef EALREADY -#define EALREADY 103 -#endif - -#ifndef ECONNREFUSED -#define ECONNREFUSED 107 -#endif - -#ifndef ECONNRESET -#define ECONNRESET 108 -#endif - -#ifndef EDESTADDRREQ -#define EDESTADDRREQ 109 -#endif - -#ifndef EHOSTUNREACH -#define EHOSTUNREACH 110 -#endif - -#ifndef EMSGSIZE -#define EMSGSIZE 115 -#endif - -#ifndef ENETDOWN -#define ENETDOWN 116 -#endif - -#ifndef ENETRESET -#define ENETRESET 117 -#endif - -#ifndef ENETUNREACH -#define ENETUNREACH 118 -#endif - -#ifndef ENOPROTOOPT -#define ENOPROTOOPT 123 -#endif - -#ifndef ENOTSOCK -#define ENOTSOCK 128 -#endif - -#ifndef ENOTCONN -#define ENOTCONN 126 -#endif - -#ifndef ECANCELED -#define ECANCELED 105 -#endif - -#ifndef EINPROGRESS -#define EINPROGRESS 112 -#endif - -#ifndef EOPNOTSUPP -#define EOPNOTSUPP 130 -#endif - -#ifndef EWOULDBLOCK -#define EWOULDBLOCK 140 -#endif - -#ifndef EOWNERDEAD -#define EOWNERDEAD 133 -#endif - -#ifndef EPROTO -#define EPROTO 134 -#endif - -#ifndef EPROTONOSUPPORT -#define EPROTONOSUPPORT 135 -#endif - -#ifndef EBADMSG -#define EBADMSG 104 -#endif - -#ifndef EIDRM -#define EIDRM 111 -#endif - -#ifndef ENODATA -#define ENODATA 120 -#endif - -#ifndef ENOLINK -#define ENOLINK 121 -#endif - -#ifndef ENOMSG -#define ENOMSG 122 -#endif - -#ifndef ENOSR -#define ENOSR 124 -#endif - -#ifndef ENOSTR -#define ENOSTR 125 -#endif - -#ifndef ENOTRECOVERABLE -#define ENOTRECOVERABLE 127 -#endif - -#ifndef ETIME -#define ETIME 137 -#endif - -#ifndef ETXTBSY -#define ETXTBSY 139 -#endif - -/* Defined as WSAETIMEDOUT. */ -#ifndef ETIMEDOUT -#define ETIMEDOUT 138 -#endif - -#ifndef ELOOP -#define ELOOP 114 -#endif - -#ifndef EPROTOTYPE -#define EPROTOTYPE 136 -#endif - -#ifndef EOVERFLOW -#define EOVERFLOW 132 -#endif - -#ifdef __cplusplus -} -#endif -#endif From 7e6b2ed26b7b6bba82975314efdb46cee07186ca Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 00:09:58 -0700 Subject: [PATCH 4/5] CI: auto-refresh the images every 7 days ... ... a manual trigger is added as well, just in case --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6cbdd3..87b76d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,9 @@ name: 'Yuzu Docker Image CI' on: + workflow_dispatch: + inputs: {} + schedule: + - cron: '0 7 * * 0' push: branches: ["master"] pull_request: From 264af2410a1f03f12c4e65b6bcf3b358a27ffd46 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 23 Dec 2021 00:54:09 -0700 Subject: [PATCH 5/5] linux-fresh: use newer git --- linux-fresh/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 70944ed..0e60a9b 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -18,7 +18,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ build-essential \ ccache \ file \ - git \ gpg-agent \ liblz4-dev \ libopus-dev \ @@ -42,10 +41,12 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ add-apt-repository -y ppa:cybermax-dexter/sdl2-backport && \ add-apt-repository -y ppa:jonathonf/ffmpeg-4 && \ add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ + add-apt-repository -y ppa:git-core/ppa && \ apt-get update -y && \ apt-get install --no-install-recommends -y \ g++-${GCC_VER} \ gcc-${GCC_VER} \ + git \ libavcodec-dev \ libavutil-dev \ libsdl2-dev \