Fix docker build

This commit is contained in:
Dane Everitt 2020-11-14 20:46:37 -08:00
parent e84008d19b
commit aaaa05be93
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 23 additions and 13 deletions

View file

@ -7,10 +7,17 @@ on:
- 'v*' - 'v*'
jobs: jobs:
push_to_registry: push_to_registry:
name: Push Image to Github Packages name: Push Image to GitHub Packages
runs-on: ubuntu-latest 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: steps:
- uses: actions/checkout@v2 - 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-qemu-action@v1
- uses: docker/setup-buildx-action@v1 - uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1 - uses: docker/login-action@v1
@ -20,18 +27,15 @@ jobs:
password: ${{ secrets.REGISTRY_TOKEN }} password: ${{ secrets.REGISTRY_TOKEN }}
- name: Release Production Build - name: Release Production Build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
if: contains(github.ref, 'develop') != true if: "!contains(github.ref, 'develop')"
env:
GITHUB_REF: ${{ github.ref }}
with: with:
push: true push: true
tags: | tags: ${{ steps.docker_meta.outputs.tags }}
ghcr.io/pterodactyl/panel:latest labels: ${{ steps.docker_meta.outputs.labels }}
ghcr.io/pterodactyl/panel:${GITHUB_REF}
- name: Release Development Build - name: Release Development Build
uses: docker/build-push-action@v2 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: with:
push: true push: ${{ github.event_name != 'pull_request' }}
tags: | tags: ${{ steps.docker_meta.outputs.tags }}
ghcr.io/pterodactyl/panel:develop labels: ${{ steps.docker_meta.outputs.labels }}

View file

@ -7,8 +7,8 @@ on:
pull_request: pull_request:
jobs: jobs:
integration_tests: integration_tests:
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
services: services:
mysql: mysql:
image: mysql:5.7 image: mysql:5.7

View file

@ -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. 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 ## v1.1.1
### Fixed ### Fixed
* Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up. * Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up.

View file

@ -47,7 +47,7 @@ services:
image: redis:alpine image: redis:alpine
restart: always restart: always
panel: panel:
image: quay.io/pterodactyl/panel:latest image: ghcr.io/pterodactyl/panel:latest
restart: always restart: always
ports: ports:
- "80:80" - "80:80"