diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 19a8b0707..f5e4a4f2e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,10 +7,17 @@ on: - 'v*' jobs: push_to_registry: - name: Push Image to Github Packages + 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/panel - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 - uses: docker/login-action@v1 @@ -20,18 +27,15 @@ jobs: password: ${{ secrets.REGISTRY_TOKEN }} - name: Release Production Build uses: docker/build-push-action@v2 - if: contains(github.ref, 'develop') != true - env: - GITHUB_REF: ${{ github.ref }} + if: "!contains(github.ref, 'develop')" with: push: true - tags: | - ghcr.io/pterodactyl/panel:latest - ghcr.io/pterodactyl/panel:${GITHUB_REF} + 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') && && !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]') + if: "contains(github.ref, 'develop')" with: - push: true - tags: | - ghcr.io/pterodactyl/panel:develop + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.docker_meta.outputs.tags }} + labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d9c21e68..73d56ad72 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,8 +7,8 @@ on: pull_request: jobs: integration_tests: - if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" services: mysql: image: mysql:5.7 diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c9c853c..936c2b6a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ This file is a running track of new features and fixes to each version of the pa This project follows [Semantic Versioning](http://semver.org) guidelines. +## v1.1.2 +### Fixed +* Fixes an exception thrown while trying to validate IP access for the client API. +* Fixes command history scrolling not putting the cursor at the end of the line. +* Fixes file manager rows triggering a 404 when middle-clicked to open in a new tab. + ## v1.1.1 ### Fixed * Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up. diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 036bceb9a..deaf6cade 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -47,7 +47,7 @@ services: image: redis:alpine restart: always panel: - image: quay.io/pterodactyl/panel:latest + image: ghcr.io/pterodactyl/panel:latest restart: always ports: - "80:80"