Merge branch 'dane/docker' into develop

Author: DaneEveritt

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."
@@ -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,37 @@
+name: Publish Docker Image
+on:
+  push:
+    branches:
+      - 'develop'
+    tags:
+      - 'v*'
+jobs:
+  push_to_registry:
+    name: Push Image to Github Packages
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - 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') != true
+        env:
+          GITHUB_REF: ${{ github.ref }}
+        with:
+          push: true
+          tags: |
+            ghcr.io/pterodactyl/panel:latest
+            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]')
+        with:
+          push: true
+          tags: |
+            ghcr.io/pterodactyl/panel:develop

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:

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

@@ -1,36 +1,39 @@
-FROM php:7.4-fpm-alpine
-
+# Stage 0:
+# Build the assets that are needed for the frontend. This build stage is then discarded
+# since we won't need NodeJS anymore in the future. This Docker image ships a final production
+# level distribution of Pterodactyl.
+FROM mhart/alpine-node:14
 WORKDIR /app
-
-RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot yarn; \
-    docker-php-ext-install bcmath; \
-    docker-php-ext-install gd; \
-    docker-php-ext-install mbstring; \
-    docker-php-ext-install pdo; \
-    docker-php-ext-install pdo_mysql; \
-    docker-php-ext-install tokenizer; \
-    docker-php-ext-install xml; \
-    docker-php-ext-configure zip --with-libzip=/usr/include; \
-    docker-php-ext-install zip; \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
 COPY . ./
+RUN yarn install --frozen-lockfile \
+    && yarn run build:production
 
-RUN cp .env.example .env \
- && composer install --no-dev --optimize-autoloader \
- && rm .env \
- && chown -R nginx:nginx . && chmod -R 777 storage/* bootstrap/cache 
-
-RUN cp docker/default.conf /etc/nginx/conf.d/default.conf \
- && cat docker/www.conf > /usr/local/etc/php-fpm.d/www.conf \
- && rm /usr/local/etc/php-fpm.d/www.conf.default \
- && cat docker/supervisord.conf > /etc/supervisord.conf \
- && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
- && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
- && mkdir -p /var/run/php /var/run/nginx
+# Stage 1:
+# Build the actual container with all of the needed PHP dependencies that will run the application.
+FROM php:7.4-fpm-alpine
+WORKDIR /app
+COPY . ./
+COPY --from=0 /app/public/assets ./public/assets
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot \
+    && docker-php-ext-configure zip \
+    && docker-php-ext-install bcmath gd pdo_mysql zip \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && cp .env.example .env \
+    && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \
+    && chmod 777 -R bootstrap storage \
+    && composer install --no-dev --optimize-autoloader \
+    && rm -rf .env bootstrap/cache/*.php \
+    && chown -R nginx:nginx .
+
+RUN rm /usr/local/etc/php-fpm.d/www.conf.default \
+    && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
+    && mkdir -p /var/run/php /var/run/nginx
+
+COPY .github/docker/default.conf /etc/nginx/conf.d/default.conf
+COPY .github/docker/www.conf /usr/local/etc/php-fpm.d/www.conf
+COPY .github/docker/supervisord.conf /etc/supervisord.conf
 
 EXPOSE 80 443
-
-ENTRYPOINT ["/bin/ash", "docker/entrypoint.sh"]
-
+ENTRYPOINT ["/bin/ash", ".github/docker/entrypoint.sh"]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]