From 181e4fa2824e8bcb349ffd49c08af76e89aefb5a Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:02:07 -0800 Subject: [PATCH 1/8] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 19a8b0707..b74c5d574 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -30,7 +30,7 @@ jobs: ghcr.io/pterodactyl/panel:${GITHUB_REF} - 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') && !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]') with: push: true tags: | From 8065b7d9f55d4d0dd2a2b9e462cfb717f0462212 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:03:32 -0800 Subject: [PATCH 2/8] use GitHub container registry [skip docker] --- docker-compose.example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From d31a2282208f002a723671091c766faa2ad0e6d4 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:04:55 -0800 Subject: [PATCH 3/8] properly skip action [docker skip] --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b74c5d574..a0e10db57 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,7 @@ jobs: push_to_registry: name: Push Image to Github Packages runs-on: ubuntu-latest + if: !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]') steps: - uses: actions/checkout@v2 - uses: docker/setup-qemu-action@v1 @@ -30,7 +31,7 @@ jobs: ghcr.io/pterodactyl/panel:${GITHUB_REF} - 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: | From d18b7abf6c7558ab8e43aa28171a5e405f7ef273 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:06:58 -0800 Subject: [PATCH 4/8] fixes [docker skip] --- .github/workflows/docker.yml | 8 ++++---- .github/workflows/tests.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a0e10db57..dcedd320c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,9 +7,9 @@ on: - 'v*' jobs: push_to_registry: - name: Push Image to Github Packages + name: Push Image to GitHub Packages runs-on: ubuntu-latest - if: !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]') + if: "!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip')" steps: - uses: actions/checkout@v2 - uses: docker/setup-qemu-action@v1 @@ -21,7 +21,7 @@ jobs: password: ${{ secrets.REGISTRY_TOKEN }} - name: Release Production Build uses: docker/build-push-action@v2 - if: contains(github.ref, 'develop') != true + if: "!contains(github.ref, 'develop')" env: GITHUB_REF: ${{ github.ref }} with: @@ -31,7 +31,7 @@ jobs: ghcr.io/pterodactyl/panel:${GITHUB_REF} - name: Release Development Build uses: docker/build-push-action@v2 - if: contains(github.ref, 'develop') + if: "contains(github.ref, 'develop')" with: push: true tags: | 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 From 89e10fd7f2db1125b28538508c0f21cd287f8d1a Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:14:16 -0800 Subject: [PATCH 5/8] Update CHANGELOG.md [docker skip] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) 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. From 509c4e577b8944bb64bc617fee9dcada83daf1eb Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:15:46 -0800 Subject: [PATCH 6/8] Update docker.yml --- .github/workflows/docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dcedd320c..a6949512f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,9 @@ jobs: push_to_registry: name: Push Image to GitHub Packages runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip')" + # 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: docker/setup-qemu-action@v1 From 043dc204278a490096937d37b9322f78ab2aec44 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:27:11 -0800 Subject: [PATCH 7/8] Update docker.yml --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a6949512f..94778ff1a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -25,12 +25,12 @@ jobs: uses: docker/build-push-action@v2 if: "!contains(github.ref, 'develop')" env: - GITHUB_REF: ${{ github.ref }} + REF: ${{ github.ref }} with: push: true tags: | ghcr.io/pterodactyl/panel:latest - ghcr.io/pterodactyl/panel:${GITHUB_REF} + ghcr.io/pterodactyl/panel:${REF:11} - name: Release Development Build uses: docker/build-push-action@v2 if: "contains(github.ref, 'develop')" From 280bbce69f323762d87002235f6dfc9c349428b7 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 14 Nov 2020 20:45:42 -0800 Subject: [PATCH 8/8] Update docker.yml --- .github/workflows/docker.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 94778ff1a..f5e4a4f2e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,6 +14,10 @@ jobs: 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 @@ -24,17 +28,14 @@ jobs: - name: Release Production Build uses: docker/build-push-action@v2 if: "!contains(github.ref, 'develop')" - env: - REF: ${{ github.ref }} with: push: true - tags: | - ghcr.io/pterodactyl/panel:latest - ghcr.io/pterodactyl/panel:${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: 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 }}