Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
name: Docker Image CI
name: Docker Image CI (main push)

on:
workflow_dispatch:
inputs:
runner:
required: false
default: ubuntu-latest
description: The runner of the workflow
push:
branches: [ "main" ]

jobs:

build:

runs-on: ubuntu-latest
runs-on: ${{ github.event_name == 'workflow_dispatch' && inputs.runner || 'ubuntu-latest' }}

steps:
- uses: actions/checkout@v3
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/pull_request_test.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
name: Docker Image CI
name: Docker Image CI - Test pull requests

on:
workflow_dispatch:
inputs:
runner:
required: false
default: ubuntu-latest
description: The runner of the workflow
pull_request:
branches: [ "main" ]

jobs:

build:

runs-on: ubuntu-latest
runs-on: ${{ github.event_name == 'workflow_dispatch' && inputs.runner || 'ubuntu-latest' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v3

- name: Build the Docker image
run: docker build . --file Dockerfile --tag fuzzystatic/nitrox-server:latest
- name: Build the Docker image
run: docker build . --file Dockerfile --tag fuzzystatic/nitrox-server:latest
2 changes: 1 addition & 1 deletion run-nitrox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ done
# Start the server executable
echo "Starting the Nitrox server..."
cd /config
SUBNAUTICA_INSTALLATION_PATH="$(cat /path.txt)" exec ./Nitrox.Server.Subnautica --save "${SUBNAUTICA_SAVE:-"My World"}" # Got this from Procesmon, this works
SUBNAUTICA_INSTALLATION_PATH="$(cat /config/path.txt)" exec ./Nitrox.Server.Subnautica --save "${SUBNAUTICA_SAVE:-"My World"}" # Got this from Procesmon, this works
Loading