From be1bfe9f561413865db78d2e895910a2113ef9e2 Mon Sep 17 00:00:00 2001 From: Refringe Date: Sat, 2 Mar 2024 22:29:09 -0500 Subject: [PATCH] Add build steps for modules and launcher, remove Dockerfile --- .gitea/workflows/build.yaml | 21 ++++++++++++++++++++- Dockerfile.dotnet | 8 ++++++++ Dockerfile => Dockerfile.node | 19 ++++++++----------- 3 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 Dockerfile.dotnet rename Dockerfile => Dockerfile.node (79%) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 94404f4..bfc8e95 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -93,5 +93,24 @@ jobs: with: name: server-build path: ./server/project/build/ - overwrite: true + + Build Modules: + runs-on: ubuntu-latest + container: + image: refringe/spt-build-dotnet:0.0.1 + steps: + - name: Clone + run: | + rm -rf ./modules + git clone https://dev.sp-tarkov.com/SPT-AKI/Modules.git --branch 3.8.0-BE --depth 1 ./modules + + Build Launcher: + runs-on: ubuntu-latest + container: + image: refringe/spt-build-dotnet:0.0.1 + steps: + - name: Clone + run: | + rm -rf ./launcher + git clone https://dev.sp-tarkov.com/SPT-AKI/Launcher.git --branch 3.8.0-BE --depth 1 ./launcher diff --git a/Dockerfile.dotnet b/Dockerfile.dotnet new file mode 100644 index 0000000..27e577c --- /dev/null +++ b/Dockerfile.dotnet @@ -0,0 +1,8 @@ +# Use the .NET 6.0 SDK base image +FROM mcr.microsoft.com/dotnet/sdk:6.0 + +# Install necessary tools and dependencies (git, zstd, wget, and p7zip-full) +RUN apt-get update && \ + apt-get install -y git zstd wget p7zip-full && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile b/Dockerfile.node similarity index 79% rename from Dockerfile rename to Dockerfile.node index 04eada3..f231261 100644 --- a/Dockerfile +++ b/Dockerfile.node @@ -1,11 +1,8 @@ -# Use the Node v20.10.0 base image -FROM node:20.10.0 - -# Install necessary tools and dependencies (git, git-lfs, and zstd) -RUN apt-get update && \ - apt-get install -y git git-lfs zstd && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Set the working directory to /code -WORKDIR /code +# Use the Node v20.10.0 base image +FROM node:20.10.0 + +# Install necessary tools and dependencies (git, git-lfs, and zstd) +RUN apt-get update && \ + apt-get install -y git git-lfs zstd && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/*