Merge branch 'develop' into develop

Author: GravityCube

docker/README.md .github/docker/README.mddocker/README.md renamed to .github/docker/README.md

@@ -1,18 +1,14 @@
 #!/bin/ash
-## Ensure we are in /app
-
 cd /app
 
 mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php7/ \
-&& rm -rf /app/storage/logs/ \
-&& chmod 777 /var/log/panel/logs/ \
-&& ln -s /var/log/panel/logs/ /app/storage/
+  && chmod 777 /var/log/panel/logs/ \
+  && ln -s /var/log/panel/logs/ /app/storage/logs/
 
 ## check for .env file and generate app keys if missing
 if [ -f /app/var/.env ]; then
   echo "external vars exist."
   rm -rf /app/.env
-
   ln -s /app/var/.env /app/
 else
   echo "external vars don't exist."
@@ -46,10 +42,10 @@ else
   echo "Checking if letsencrypt email is set."
   if [ -z $LE_EMAIL ]; then
     echo "No letsencrypt email is set using http config."
-    cp docker/default.conf /etc/nginx/conf.d/default.conf
+    cp .github/docker/default.conf /etc/nginx/conf.d/default.conf
   else
     echo "writing ssl config"
-    cp docker/default_ssl.conf /etc/nginx/conf.d/default.conf
+    cp .github/docker/default_ssl.conf /etc/nginx/conf.d/default.conf
     echo "updating ssl config for domain"
     sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
     echo "generating certs"
@@ -60,26 +56,19 @@ fi
 ## check for DB up before starting the panel
 echo "Checking database status."
 until nc -z -v -w30 $DB_HOST 3306
-
 do
   echo "Waiting for database connection..."
-  # wait for 5 seconds before check again
-  sleep 5
+  # wait for 1 seconds before check again
+  sleep 1
 done
 
 ## make sure the db is set up
 echo -e "Migrating and Seeding D.B"
-php artisan migrate --force
-php artisan db:seed --force
+php artisan migrate --seed --force
 
 ## start cronjobs for the queue
 echo -e "Starting cron jobs."
 crond -L /var/log/crond -l 5
 
-## install yarn stuff
-yarn install --production
-yarn add cross-env
-yarn run build:production
-
 echo -e "Starting supervisord."
 exec "$@"

docker/default.conf .github/docker/default.confdocker/default.conf renamed to .github/docker/default.conf

@@ -0,0 +1,41 @@
+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/panel
+      - 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')"
+        with:
+          push: true
+          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' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}

docker/default_ssl.conf .github/docker/default_ssl.confdocker/default_ssl.conf renamed to .github/docker/default_ssl.conf

@@ -1,10 +1,8 @@
-name: "Release"
-
+name: Create Release
 on:
   push:
     tags:
       - 'v*'
-
 jobs:
   release:
     runs-on: ubuntu-20.04
@@ -13,7 +11,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12'
-      
+
       - name: Create release branch and bump version
         env:
           REF: ${{ github.ref }}
@@ -32,7 +30,7 @@ jobs:
         run: |
           yarn install
           yarn run build:production
-      
+
       - name: Create release archive
         run: |
           rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.dusk.xml phpunit.xml Vagrantfile
@@ -63,25 +61,25 @@ jobs:
           body_path: ./RELEASE_CHANGELOG
           draft: true
           prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-      
+
       - name: Upload binary
         id: upload-release-archive
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: panel.tar.gz
           asset_name: panel.tar.gz
           asset_content_type: application/gzip
-      
+
       - name: Upload checksum
-        id: upload-release-checksum 
+        id: upload-release-checksum
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./checksum.txt
           asset_name: checksum.txt
           asset_content_type: text/plain

docker/entrypoint.sh .github/docker/entrypoint.shdocker/entrypoint.sh renamed to .github/docker/entrypoint.sh

@@ -1,4 +1,4 @@
-name: tests
+name: Run Test Suite
 on:
   push:
     branch-ignore:
@@ -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

docker/supervisord.conf .github/docker/supervisord.confdocker/supervisord.conf renamed to .github/docker/supervisord.conf

@@ -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.