Skip to content

Commit aaaa05b

Browse files
committed
Fix docker build
1 parent e84008d commit aaaa05b

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

.github/workflows/docker.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@ on:
77
- 'v*'
88
jobs:
99
push_to_registry:
10-
name: Push Image to Github Packages
10+
name: Push Image to GitHub Packages
1111
runs-on: ubuntu-latest
12+
# Always run against a tag, even if the commit into the tag has [docker skip]
13+
# within the commit message.
14+
if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
1215
steps:
1316
- uses: actions/checkout@v2
17+
- uses: crazy-max/ghaction-docker-meta@v1
18+
id: docker_meta
19+
with:
20+
images: ghcr.io/pterodactyl/panel
1421
- uses: docker/setup-qemu-action@v1
1522
- uses: docker/setup-buildx-action@v1
1623
- uses: docker/login-action@v1
@@ -20,18 +27,15 @@ jobs:
2027
password: ${{ secrets.REGISTRY_TOKEN }}
2128
- name: Release Production Build
2229
uses: docker/build-push-action@v2
23-
if: contains(github.ref, 'develop') != true
24-
env:
25-
GITHUB_REF: ${{ github.ref }}
30+
if: "!contains(github.ref, 'develop')"
2631
with:
2732
push: true
28-
tags: |
29-
ghcr.io/pterodactyl/panel:latest
30-
ghcr.io/pterodactyl/panel:${GITHUB_REF}
33+
tags: ${{ steps.docker_meta.outputs.tags }}
34+
labels: ${{ steps.docker_meta.outputs.labels }}
3135
- name: Release Development Build
3236
uses: docker/build-push-action@v2
33-
if: contains(github.ref, 'develop') && && !contains(github.event.head_commit.message, '[skip docker]') && !contains(github.event.head_commit.message, '[docker skip]')
37+
if: "contains(github.ref, 'develop')"
3438
with:
35-
push: true
36-
tags: |
37-
ghcr.io/pterodactyl/panel:develop
39+
push: ${{ github.event_name != 'pull_request' }}
40+
tags: ${{ steps.docker_meta.outputs.tags }}
41+
labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
pull_request:
88
jobs:
99
integration_tests:
10-
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
1110
runs-on: ubuntu-latest
11+
if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
1212
services:
1313
mysql:
1414
image: mysql:5.7

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ This file is a running track of new features and fixes to each version of the pa
33

44
This project follows [Semantic Versioning](http://semver.org) guidelines.
55

6+
## v1.1.2
7+
### Fixed
8+
* Fixes an exception thrown while trying to validate IP access for the client API.
9+
* Fixes command history scrolling not putting the cursor at the end of the line.
10+
* Fixes file manager rows triggering a 404 when middle-clicked to open in a new tab.
11+
612
## v1.1.1
713
### Fixed
814
* Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up.

docker-compose.example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
image: redis:alpine
4848
restart: always
4949
panel:
50-
image: quay.io/pterodactyl/panel:latest
50+
image: ghcr.io/pterodactyl/panel:latest
5151
restart: always
5252
ports:
5353
- "80:80"

0 commit comments

Comments
 (0)