diff --git a/.gitignore b/.gitignore index 79c7fa64..aabac247 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.elf *.exe *.bat -.devkitpro_cache .vscode/ build/ usbloader_gx/ diff --git a/Dockerfile b/Dockerfile index 58d7fbbb..3977a0af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" RUN apt-get update -y && apt-get install -y \ xz-utils make git zip -COPY .devkitpro_cache/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz / -COPY .devkitpro_cache/libogc-2.3.1-1-any.pkg.tar.xz / -COPY .devkitpro_cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz / -COPY .devkitpro_cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz / -COPY .devkitpro_cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz / RUN tar -xf /devkitPPC-r41-2-linux_x86_64.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \ diff --git a/build.sh b/build.sh deleted file mode 100755 index 436ffca9..00000000 --- a/build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -function download_devkitpro() { - echo "Downloading devkitpro packages..." - - devkitpro_archives=( - "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz" - "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz" - "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz" - "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz" - "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz" - ) - - # Create a directory for the downloads - mkdir -p devkitPro_assets - - any_downloads=false - - # Download the files - for url in "${devkitpro_archives[@]}"; do - # download if not already downloaded - [ ! -f ".devkitpro_cache/$(basename "$url")" ] \ - && echo "Downloading $(basename "$url") from $url" \ - && wget -q --show-progress -P .devkitpro_cache "$url" \ - && any_downloads=true - done - - if [ "$any_downloads" = false ]; then - echo "All devkitpro packages are already downloaded." - fi - - echo "" -} - -download_devkitpro - -echo "Building the project in docker..." -DOCKER_BUILDKIT=1 docker build -o output . - -echo "" -echo "Done! Check output/ for the built files."