From dca981d63b3964a06a7eea76744ad880679850da Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sun, 13 Feb 2022 14:18:39 +0100
Subject: [PATCH] Update devkitppc image

---
 devkitppc/Dockerfile      | 15 ++++++++++++---
 toolchain-base/Dockerfile | 28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 toolchain-base/Dockerfile

diff --git a/devkitppc/Dockerfile b/devkitppc/Dockerfile
index d7c8c81..19ca622 100644
--- a/devkitppc/Dockerfile
+++ b/devkitppc/Dockerfile
@@ -1,4 +1,13 @@
-FROM devkitpro/devkitppc@sha256:b4c7622442bef192fa13ef34ec90741820cef2fb0c6d6b317a9bd55da06cfa60
+FROM wiiu-env/toolchain-base:20220211
+
 RUN ln -sf /proc/mounts /etc/mtab
-RUN dkp-pacman -Syyu --noconfirm && dkp-pacman -Scc --noconfirm
-RUN git clone --depth 1 --single-branch -b master https://github.com/devkitPro/wut && cd wut && git reset --hard 888bab16b5e74a09d0c4d219607f65cc44e7b4ec && make install && cd .. && rm -rf wut
\ No newline at end of file
+
+RUN dkp-pacman -Syyu --noconfirm wiiu-dev && \
+    dkp-pacman -S --needed --noconfirm ppc-portlibs wiiu-portlibs && \
+    dkp-pacman -S --needed --noconfirm devkitARM && \
+    yes | dkp-pacman -Scc
+
+ENV DEVKITPPC=${DEVKITPRO}/devkitPPC
+ENV DEVKITARM=/opt/devkitpro/devkitARM
+
+RUN git clone --depth 1 --single-branch -b master https://github.com/devkitPro/wut && cd wut && git reset --hard fefde021b90532b972516fa252beca045f77fe3f && make install && cd .. && rm -rf wut
\ No newline at end of file
diff --git a/toolchain-base/Dockerfile b/toolchain-base/Dockerfile
new file mode 100644
index 0000000..69c090d
--- /dev/null
+++ b/toolchain-base/Dockerfile
@@ -0,0 +1,28 @@
+FROM debian:buster-slim
+
+MAINTAINER Maschell <maschell@gmx.de>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends apt-utils && \
+    apt-get install -y --no-install-recommends sudo ca-certificates pkg-config curl wget bzip2 xz-utils make bsdtar doxygen gnupg && \
+    apt-get install -y --no-install-recommends git git-restore-mtime && \
+    apt-get install -y --no-install-recommends gdebi-core && \
+    apt-get install -y --no-install-recommends cmake zip unzip && \
+    apt-get install -y --no-install-recommends locales && \
+    sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget https://github.com/devkitPro/pacman/releases/latest/download/devkitpro-pacman.amd64.deb && \
+    gdebi -n devkitpro-pacman.amd64.deb && \
+    rm devkitpro-pacman.amd64.deb && \
+    dkp-pacman -Scc --noconfirm
+
+ENV LANG en_US.UTF-8
+
+ENV DEVKITPRO=/opt/devkitpro
+ENV PATH=${DEVKITPRO}/tools/bin:$PATH
\ No newline at end of file