From 8eaf9cc02699de334b75086e5183f41c6685a8ef Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sat, 22 Sep 2018 20:37:36 +0200
Subject: [PATCH] Remove docker image caching, use devkitpro/dekitarm image
 from docker hub instead of an own installation

---
 .travis.yml | 24 ++++--------------------
 Dockerfile  |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d38b1f1..4fad721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,10 @@
 sudo: required
-
-before_cache:
-  # Save tagged docker images see https://github.com/travis-ci/travis-ci/issues/5358#issuecomment-248915326
-  - >
-    mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
-    | grep 'wups-loader-builder'
-    | xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
-
-cache:
-  bundler: true
-  directories:
-    - $HOME/docker
-
+branches:
+  only:
+   - master
 services:
 - docker
 
-before_install:
-  # Load cached docker images
-  - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
-
 addons:
   apt:
     packages:
@@ -54,6 +40,4 @@ deploy:
         secure: X2kG+KU92Z1G4nMNIycVWk1nvKjfmDlyyh0rYIKbpt2JmvBv/fO4v6oPrVVec7Zc3m42VeqFdjrCn0VatBwNkW9TLjGCysvZrUh2BOgA8cIfJvnt54bckbdbt4DgN6H/QAW7pHVjv6eDZLH4IhBIaxSDN60mhAu2Aa7cZdkkBrHeKwks+fztBNvOYqPcOgxWQbLtN2e9LBk+0tt6n64/Z5F37ydTXm5B8LSI5oEPifPWYfycqmEFxKJUIRPr149Iz62nET/aMC9fUOCjjTOS9k/J0NVuhD/433dto60OUXWGKrMSwfz1hP7HIChgEvxWeczSZP2MczcKm+jZgLK7ML7nIwBIMQovNb8qXdLfRY//IbGYTTjA/4efJ/Przpahry2/5JTAtWxVpfkjXNsajSFFxqYpHkNcYK0+lV2la+Gdp3l7ZkjTcAw22RA6Epfr53cYxXY7PapTc/g/Xe9SMI236QoMobDwAYsxU8Oz+LcCx7an1vJp3O59HqQx5YNNfmSSHOx3DY5Vt4Zxc4POx+v7UIJtJXJZWj09j1s/Spn1Lv7gRomxemneSzsNYMgLduQzwCGD9Eo8DDFyvr//nf5GOB5PDqSP1K9GfLlJs04YdT6Giw/p6JRqvQxnVFIP0I0tll6OARyd6+svjf+q6AQYdlUwYqF03ciFZ555QUo=
   file: WiiUPluginLoader_$versiontag.zip
   on:
-    repo: Maschell/WiiUPluginLoader
-    tags: false
-    all_branches: true
\ No newline at end of file
+    repo: Maschell/WiiUPluginLoader
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4eb1b1e..147e5e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@ FROM wups/core:latest
 RUN rm -rf $DEVKITPRO/portlibs
 
 # Install devkitARM. Needed to build mocha.
-RUN yes | sudo dkp-pacman -Syu devkitARM --needed 
 ENV DEVKITARM=${DEVKITPRO}/devkitARM
+COPY --from=devkitpro/devkitarm $DEVKITARM $DEVKITARM
 
 # Get dependencies
 COPY --from=wiiulegacy/dynamic_libs:0.1 /artifacts $DEVKITPRO/portlibs