diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e99d8bfc..84953643 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,12 +1,10 @@ -name: "Build & Test" - +name: Run Tests on: push: branches-ignore: - 'master' - 'release/**' pull_request: - jobs: build: strategy: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d52ec6ad..23efff06 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,16 +1,11 @@ -name: "Code scanning - action" - +name: CodeQL Scanning on: - push: + branches: + - 'develop' pull_request: - schedule: - - cron: '0 21 * * 6' - jobs: CodeQL-Build: - runs-on: ubuntu-latest - steps: - name: Checkout repository uses: actions/checkout@v2 @@ -18,12 +13,11 @@ jobs: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout # the head of the pull request instead of the merge commit. - run: git checkout HEAD^2 if: ${{ github.event_name == 'pull_request' }} - + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v1 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..22b7d99e --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,47 @@ +name: Publish Docker Image +on: + push: + branches: + - 'develop' + tags: + - 'v*' +jobs: + push_to_registry: + name: Push Image to GitHub Packages + runs-on: ubuntu-latest + # Always run against a tag, even if the commit into the tag has [docker skip] + # within the commit message. + if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))" + steps: + - uses: actions/checkout@v2 + - uses: crazy-max/ghaction-docker-meta@v1 + id: docker_meta + with: + images: ghcr.io/pterodactyl/wings + - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-buildx-action@v1 + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - name: Release Production Build + uses: docker/build-push-action@v2 + if: "!contains(github.ref, 'develop')" + env: + REF: ${{ github.ref }} + with: + push: true + build-args: | + VERSION=${REF:11} + tags: ${{ steps.docker_meta.outputs.tags }} + labels: ${{ steps.docker_meta.outputs.labels }} + - name: Release Development Build + uses: docker/build-push-action@v2 + if: "contains(github.ref, 'develop')" + with: + push: ${{ github.event_name != 'pull_request' }} + build-args: | + VERSION=dev-${GIT_COMMIT:0:7} + tags: ${{ steps.docker_meta.outputs.tags }} + labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc98a75f..29481a7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,8 @@ -name: "Release" - +name: Create Release on: push: tags: - 'v*' - jobs: release: runs-on: ubuntu-20.04 diff --git a/CHANGELOG.md b/CHANGELOG.md index d63d5e67..34c23ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## v1.1.2 +### Fixed +* Fixes binaries built as part of the release process not being usable in MUSL based environments (such as our Docker images). +* Fixes server states being incorrectly set back to offline when a server is started after a system restart. + +### Changed +* Improved logic for cleaning `allowed_mount` paths for consistency. +* Certain context cancelation deadline errors are no longer wrong reported at an error level (since they're expected). +* Very minor micro-optimizations for some string handling with server console output. + +### Added +* Added a hidden option to disable all disk checking for servers by setting the `disk_check_interval` to `0` in the config file. + ## v1.1.1 ### Fixed * Fixes certain files returning invalid data in the request due to a bad header set after sending data down the line. diff --git a/docker-compose.example.yml b/docker-compose.example.yml index b199b416..5cafc8a0 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -1,7 +1,7 @@ version: '3.8' services: wings: - image: quay.io/pterodactyl/wings:latest + image: ghcr.io/pterodactyl/wings:latest restart: always networks: - wings0 @@ -24,7 +24,7 @@ services: # Required for ssl if you user let's encrypt. uncomment to use. #- "/etc/letsencrypt/:/etc/letsencrypt/" networks: - daemon0: + wings0: name: wings0 driver: bridge ipam: