From 118ec59e673ccd0aa16e4de988c336d45517ec5e Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 7 Jul 2024 01:24:23 -0700 Subject: [PATCH] Implement a basic generic compiler for linux --- FirestormLinux/Dockerfile | 2 +- FirestormWindows/Dockerfile | 0 LinuxGeneralCompiler/Dockerfile | 13 +++++++++++++ WindowsGeneralCompiler/Dockerfile | 0 build.bat | 8 +------- build.sh | 8 +------- 6 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 FirestormWindows/Dockerfile delete mode 100644 WindowsGeneralCompiler/Dockerfile diff --git a/FirestormLinux/Dockerfile b/FirestormLinux/Dockerfile index ba2c0ff..c3276f2 100644 --- a/FirestormLinux/Dockerfile +++ b/FirestormLinux/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:jammy RUN apt-get update RUN apt-get full-upgrade -qy -RUN apt-get install libgl1-mesa-dev libglu1-mesa-dev libpulse-dev build-essential python3-pip git libssl-dev libxinerama-dev libxrandr-dev libfontconfig-dev libfreetype6-dev gcc-11 cmake +RUN apt-get install libgl1-mesa-dev libglu1-mesa-dev libpulse-dev build-essential python3-pip git libssl-dev libxinerama-dev libxrandr-dev libfontconfig-dev libfreetype6-dev gcc-11 cmake openjdk-17-jre RUN pip3 install --upgrade pip RUN pip install llbase autobuild llsd diff --git a/FirestormWindows/Dockerfile b/FirestormWindows/Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/LinuxGeneralCompiler/Dockerfile b/LinuxGeneralCompiler/Dockerfile index e69de29..8c515c0 100644 --- a/LinuxGeneralCompiler/Dockerfile +++ b/LinuxGeneralCompiler/Dockerfile @@ -0,0 +1,13 @@ +FROM debian:latest + +ARG JENKINS_SECRET=notset + +ENV DOCKER 1 +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 + +WORKDIR / +RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar + +ENTRYPOINT [ "java", "-jar", "/agent.jar", "-url", "https://ci.zontreck.com", "-secret", JENKINS_SECRET, "-name", "Linux", "-workDir", "/builder" ] \ No newline at end of file diff --git a/WindowsGeneralCompiler/Dockerfile b/WindowsGeneralCompiler/Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/build.bat b/build.bat index a27bfa3..79d47d6 100644 --- a/build.bat +++ b/build.bat @@ -3,11 +3,5 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:firestormlinux FirestormLinux/Dockerfile docker push git.zontreck.com/ariascreations/buildenvironments:firestormlinux -docker build -t git.zontreck.com/ariascreations/buildenvironments:firestormwin FirestormWindows/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:firestormwin - docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:linux - -docker build -t git.zontreck.com/ariascreations/buildenvironments:windows WindowsGeneralCompiler/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:windows \ No newline at end of file +docker push git.zontreck.com/ariascreations/buildenvironments:linux \ No newline at end of file diff --git a/build.sh b/build.sh index 548ddea..1673b0e 100644 --- a/build.sh +++ b/build.sh @@ -3,11 +3,5 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:firestormlinux FirestormLinux/Dockerfile docker push git.zontreck.com/ariascreations/buildenvironments:firestormlinux -docker build -t git.zontreck.com/ariascreations/buildenvironments:firestormwin FirestormWindows/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:firestormwin - docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:linux - -docker build -t git.zontreck.com/ariascreations/buildenvironments:windows WindowsGeneralCompiler/Dockerfile -docker push git.zontreck.com/ariascreations/buildenvironments:windows \ No newline at end of file +docker push git.zontreck.com/ariascreations/buildenvironments:linux \ No newline at end of file