diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 130d550..c2ebfce 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-server:0.0.6 + image: refringe/spt-build-server:1.0.0 outputs: build_type: ${{ steps.build-type.outputs.build_type }} steps: @@ -137,7 +137,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.6 + image: refringe/spt-build-modules:1.0.0 outputs: client_version: ${{ steps.extract-client-version.outputs.client_version }} steps: @@ -223,7 +223,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.6 + image: refringe/spt-build-launcher:1.0.0 steps: - name: Clone run: | @@ -249,7 +249,7 @@ jobs: needs: [check-tag-exists, build-server, build-modules, build-launcher] runs-on: ubuntu-latest container: - image: refringe/spt-build-server:0.0.6 + image: refringe/spt-build-server:1.0.0 steps: - name: Clean Directory run: | diff --git a/Dockerfile.launcher b/Dockerfile.launcher new file mode 100644 index 0000000..261e8ff --- /dev/null +++ b/Dockerfile.launcher @@ -0,0 +1,18 @@ +# Use the .NET 8.0 SDK base image +FROM mcr.microsoft.com/dotnet/sdk:8.0 + +# Configure Node.js v20 repository +RUN curl -fsSL https://deb.nodesource.com/setup_20.10 | bash + +# Install necessary tools and dependencies +# - git (duh) +# - zstd (caching action dependancy) +# - wget (downloading module packages) +# - jq (fetching data from JSON files) +# - p7zip-full (extracting archives) +# - nodejs (artifact action dependancy) +# - tree (pretty print build directory structure) +RUN apt-get update && \ + apt-get install -y git zstd wget jq p7zip-full nodejs tree && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.dotnet b/Dockerfile.modules similarity index 100% rename from Dockerfile.dotnet rename to Dockerfile.modules diff --git a/Dockerfile.node b/Dockerfile.server similarity index 100% rename from Dockerfile.node rename to Dockerfile.server diff --git a/README.md b/README.md index db3d9b5..8b0d70e 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,14 @@ Be sure to update the version number to the next available version before buildi ``` # Build and push the spt-build-server Docker image to the Docker Hub -docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.node . +docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.server . docker push refringe/spt-build-server --all-tags -# Build and push the spt-build-dotnet Docker image to the Docker Hub -docker build -t refringe/spt-build-dotnet:0.0.0 -t refringe/spt-build-dotnet:latest -f Dockerfile.dotnet . -docker push refringe/spt-build-dotnet --all-tags +# Build and push the spt-build-modules Docker image to the Docker Hub +docker build -t refringe/spt-build-modules:0.0.0 -t refringe/spt-build-modules:latest -f Dockerfile.modules . +docker push refringe/spt-build-modules --all-tags + +# Build and push the spt-build-launcher Docker image to the Docker Hub +docker build -t refringe/spt-build-launcher:0.0.0 -t refringe/spt-build-launcher:latest -f Dockerfile.launcher . +docker push refringe/spt-build-launcher --all-tags ```