0
0
mirror of https://github.com/sp-tarkov/build.git synced 2025-02-12 14:30:46 -05:00

Back to two docker images; one for dotnet, one for node.

This commit is contained in:
Refringe 2024-03-08 12:21:08 -05:00
parent cb76e505e2
commit cc9efe4577
Signed by: Refringe
GPG Key ID: 7715B85B4A6306ED
5 changed files with 10 additions and 32 deletions

View File

@ -43,7 +43,7 @@ jobs:
if: needs.check-tag-exists.outputs.proceed == 'true' if: needs.check-tag-exists.outputs.proceed == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: refringe/spt-build-server:1.0.0 image: refringe/spt-build-node:1.0.0
outputs: outputs:
build_type: ${{ steps.build-type.outputs.build_type }} build_type: ${{ steps.build-type.outputs.build_type }}
steps: steps:
@ -137,7 +137,7 @@ jobs:
if: needs.check-tag-exists.outputs.proceed == 'true' if: needs.check-tag-exists.outputs.proceed == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: refringe/spt-build-modules:1.0.0 image: refringe/spt-build-dotnet:1.0.0
outputs: outputs:
client_version: ${{ steps.extract-client-version.outputs.client_version }} client_version: ${{ steps.extract-client-version.outputs.client_version }}
steps: steps:
@ -223,7 +223,7 @@ jobs:
if: needs.check-tag-exists.outputs.proceed == 'true' if: needs.check-tag-exists.outputs.proceed == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: refringe/spt-build-launcher:1.0.0 image: refringe/spt-build-dotnet:1.0.0
steps: steps:
- name: Clone - name: Clone
run: | run: |
@ -249,7 +249,7 @@ jobs:
needs: [check-tag-exists, build-server, build-modules, build-launcher] needs: [check-tag-exists, build-server, build-modules, build-launcher]
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: refringe/spt-build-server:1.0.0 image: refringe/spt-build-node:1.0.0
steps: steps:
- name: Clean Directory - name: Clean Directory
run: | run: |

View File

@ -1,18 +0,0 @@
# Use the .NET 6.0 SDK base image
FROM mcr.microsoft.com/dotnet/sdk:6.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/*

View File

@ -36,15 +36,11 @@ To build the Modules project, a link to a private repository is required for the
Be sure to update the version number to the next available version before building and pushing the Docker images. you must be logged into Docker Desktop to push the images. Be sure to update the version number to the next available version before building and pushing the Docker images. you must be logged into Docker Desktop to push the images.
``` ```
# Build and push the spt-build-server Docker image to the Docker Hub # Build and push the spt-build-node Docker image to the Docker Hub
docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.server . docker build -t refringe/spt-build-node:0.0.0 -t refringe/spt-build-node:latest -f Dockerfile.node .
docker push refringe/spt-build-server --all-tags docker push refringe/spt-build-node --all-tags
# Build and push the spt-build-modules Docker image to the Docker Hub # Build and push the spt-build-dotnet 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 build -t refringe/spt-build-dotnet:0.0.0 -t refringe/spt-build-dotnet:latest -f Dockerfile.dotnet .
docker push refringe/spt-build-modules --all-tags docker push refringe/spt-build-dotnet --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
``` ```