From 1eff162eced4240d30b0ab98cf7916fc6bf12b12 Mon Sep 17 00:00:00 2001 From: zontreck Date: Mon, 8 Jul 2024 21:45:05 -0700 Subject: [PATCH] Move a few things around, add some comments --- LinuxGeneralCompiler/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/LinuxGeneralCompiler/Dockerfile b/LinuxGeneralCompiler/Dockerfile index f7c0073..0634ac8 100644 --- a/LinuxGeneralCompiler/Dockerfile +++ b/LinuxGeneralCompiler/Dockerfile @@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt update; apt-get upgrade -y -RUN apt install -y build-essential cmake ninja-build openjdk-17-jdk nasm git curl wget openjdk-17-jre android-sdk android-sdk-build-tools android-sdk-platform-tools clang pkg-config unzip libgtk-3-dev zip lldb libglu1-mesa libpulse0 cargo python3-dev libffi-dev libssl-dev apt-utils rsync +RUN apt install -y build-essential cmake ninja-build openjdk-17-jdk nasm git curl wget openjdk-17-jre android-sdk android-sdk-build-tools android-sdk-platform-tools clang pkg-config unzip libgtk-3-dev zip lldb libglu1-mesa libpulse0 cargo python3-dev libffi-dev libssl-dev apt-utils RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar @@ -58,8 +58,7 @@ RUN chown -R root:root /flutter RUN /flutter/bin/flutter --disable-analytics -# RUN sdkmanager --install "cmdline-tools;latest" - +# Use SDK Manager to install necessary components RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update \ && while read -r pkg; do PKGS="${PKGS}${pkg} "; done < $HOME/packages.txt \ && $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} $PKGS \ @@ -77,7 +76,11 @@ ADD pub.secret / RUN cat /pub.secret | dart pub token add https://git.zontreck.com/api/packages/ariascreations/pub +# Set up needed git and extra build components + RUN git config --global user.name "zontreck" RUN git config --global user.email "tarapiccari@gmail.com" +RUN apt-get install -y rsync zip + ENTRYPOINT [ "java", "-jar", "/agent.jar", "-url", "https://ci.zontreck.com", "-secret", "@/agent.secret", "-name", "Linux", "-workDir", "/builder" ] \ No newline at end of file