diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6607c48..c8c88f1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -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 diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml index 7ae8606..73bb32c 100644 --- a/.github/workflows/pull_request_test.yml +++ b/.github/workflows/pull_request_test.yml @@ -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 diff --git a/run-nitrox.sh b/run-nitrox.sh index c26ce8e..f860628 100755 --- a/run-nitrox.sh +++ b/run-nitrox.sh @@ -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