From 35bb69a08dadf43d477868760fe75c1a62d883bb Mon Sep 17 00:00:00 2001
From: rock88 <rock88a@gmail.com>
Date: Sun, 7 Feb 2021 13:15:59 +0300
Subject: [PATCH] Try to fix docker build

---
 .github/workflows/main.yml |  2 --
 Dockerfile                 |  3 +++
 build.sh                   | 14 +-------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 26ccbcf..771b4ee 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,8 +14,6 @@ jobs:
     container:
       image: docker://florianpiesche/moonlight-nx-build:latest
       env:
-        # Set this to empty to skip building libcurl 7.69.1-1
-        LIBCURL_PKGBUILD_URL: https://github.com/devkitPro/pacman-packages/raw/1582ad85914b14497fae32a9fe9074c0374f99f7/switch/curl/PKGBUILD
         # As pkgbuild needs to run unprivileged, this defines the user it will be run as
         LIBCURL_BUILD_USER: build
 
diff --git a/Dockerfile b/Dockerfile
index 0bd0e54..86db167 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,4 +11,7 @@ RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/s
 # Install devkitpro-pkgbuild-helpers
 RUN dkp-pacman -S --noconfirm devkitpro-pkgbuild-helpers
 
+# Upgrade installed packages
+RUN dkp-pacman -Suy --noconfirm
+
 ENTRYPOINT ["/bin/bash"]
diff --git a/build.sh b/build.sh
index 32ce533..83e5c02 100755
--- a/build.sh
+++ b/build.sh
@@ -3,19 +3,7 @@
 # Exit with an error code if any of the commands fail
 set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-trap 'echo "\"${last_command}\" command filed with exit code $?."' EXIT
-
-# Compile and deploy custom libcurl if a PKGBUILD url is set
-if [[ ! -z $LIBCURL_PKGBUILD_URL ]]; then
-    curdir=$(pwd)
-    mkdir switch-libcurl
-    chown ${LIBCURL_BUILD_USER} switch-libcurl
-    cd switch-libcurl
-    wget ${LIBCURL_PKGBUILD_URL}
-    sudo -u ${LIBCURL_BUILD_USER} dkp-makepkg
-    cp -r pkg/switch-curl/opt/devkitpro/portlibs/switch/* /opt/devkitpro/portlibs/switch
-    cd ${curdir}
-fi
+trap 'echo "\"${last_command}\" command failed with exit code $?."' EXIT
 
 # Run build
 make -j NIGHTLY_BUILD=`git rev-parse --short "$GITHUB_SHA"`