Added Cloudflared Support

Idea from https://github.com/zarti0
Thank you!

Author: Ym0T

.github/workflows/docker-image.yml

@@ -5,15 +5,12 @@ on:
     - cron: '24 9 * * *'
   push:
     branches: [ "main" ]
-    # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
     branches: [ "main" ]
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
@@ -22,6 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] # PHP versions to build
+        architecture: [ 'amd64', 'arm64' ]  # Add architecture matrix
 
     permissions:
       contents: read
@@ -32,18 +30,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Install the cosign tool except on PR
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: 'v2.2.4'
-
-      # Set up BuildKit Docker container builder
-      - name: Set up Docker Buildx
+      - name: Set up BuildKit Docker container builder
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
-      # Login against a Docker registry except on PR
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
@@ -52,7 +41,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Extract metadata (tags, labels) for Docker
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
@@ -62,8 +50,7 @@ jobs:
             ${{ matrix.php-version }}-${{ github.sha }}
             ${{ matrix.php-version }}-latest
             ${{ matrix.php-version }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
+          
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
@@ -77,8 +64,8 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             PHP_VERSION=${{ matrix.php-version }}
+            ARCH=${{ matrix.architecture }}  # Pass architecture to Dockerfile
 
-      # Sign the resulting Docker image digest except on PRs.
       - name: Sign the published Docker image
         if: ${{ github.event_name != 'pull_request' }}
         env:

Dockerfile

@@ -2,13 +2,26 @@ FROM debian:bookworm-slim
 
 LABEL author="Ym0t" maintainer="[email protected]"
 
-ARG PHP_VERSION="8.3"
+ARG PHP_VERSION
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install -y git apt-transport-https lsb-release ca-certificates wget nginx \
+    && apt-get install -y \
+        git \
+        apt-transport-https \
+        lsb-release \
+        ca-certificates \
+        wget \
+        nginx \
+    && ARCH=$(uname -m) \
+    && if [ "$ARCH" = "x86_64" ]; then \
+        wget -O /tmp/cloudflared.deb https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb; \
+    elif [ "$ARCH" = "aarch64" ]; then \
+        wget -O /tmp/cloudflared.deb https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-arm64.deb; \
+    fi \
+    && dpkg -i /tmp/cloudflared.deb \
+    && rm /tmp/cloudflared.deb \
     && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
     && echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list \
     && apt-get update \
@@ -71,7 +84,6 @@ RUN apt-get update \
         php${PHP_VERSION}-maxminddb \
         php${PHP_VERSION}-protobuf \
         php${PHP_VERSION}-OPcache \
-    && apt-get purge -y --auto-remove \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m -d /home/container/ -s /bin/bash container

README.md

@@ -1,7 +1,7 @@
 # Pterodactyl Nginx egg
 
 Nginx web server egg with PHP, optional Wordpress installation and git support.
-
+<br><br>
 ## Features
 
 #### Supports AMD64 & ARM64
@@ -14,7 +14,7 @@ Nginx web server egg with PHP, optional Wordpress installation and git support.
 - ☑️ 8.0 [EOL]
 
 [PHP supported versions](https://www.php.net/supported-versions.php)
-
+<br><br>
 ## How to install
 
 - **Step 1:** Download the egg (json file `egg-nginx.json`)
@@ -23,12 +23,58 @@ Nginx web server egg with PHP, optional Wordpress installation and git support.
 - **Step 4:** Create a new server and select the "Nginx" egg
 - **Step 5:** Select the corresponding Docker image with the desired PHP version
 - **Step 6:** Fill in the text fields. Whether Wordpress is desired or not. It is important to **enter the selected PHP version in the PHP version field**.
+<br><br>
+## 🚀 Cloudflared Tunnel Tutorial  
+
+With **Cloudflared**, you can create a secure tunnel to your server, making it accessible over the internet **without** complicated port forwarding!  
+[Cloudflared | Create a remotely-managed tunnel](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/get-started/create-remote-tunnel/)
+
+### 📌 Requirements  
+- A [Cloudflare](https://dash.cloudflare.com/) account  
+- A domain (optional but recommended)  
+
+---
+
+- 🔹 **Step 1: Log in to Zero Trust ↗ and go to Networks > Tunnel**  
+- 🔹 **Step 2: Select Create a tunnel.**  
+- 🔹 **Step 3: Choose Cloudflared for the connector type and select Next.**  
+- 🔹 **Step 4: Enter a name for your tunnel.**  
+- 🔹 **Step 5: Select Save tunnel.**  
+- 🔹 **Step 6: Save the token. (The token is very long)**
+  
+![grafik](https://github.com/user-attachments/assets/0c0430a5-5cb6-45e4-8b26-1805cddde3cc)
+
+
+---
+
+- 🔹 **Step 7: Activate Cloudflared**
+    
+![grafik](https://github.com/user-attachments/assets/726c5dad-7cb6-4537-a215-6aaec59d827a)
+
+
+---
+
+- 🔹 **Step 8: Add your token.**
+  
+![grafik](https://github.com/user-attachments/assets/46b09f6a-30b0-48aa-9980-53697b1fbcf6)
 
+
+---
+
+- 🔹 **Step 9: Restart your webserver.**
+  
+![grafik](https://github.com/user-attachments/assets/84fb9b6c-10cd-4bd3-86ae-e725e7145e8d)
+
+---
+
+✅ You have successfully set up Cloudflared and connected it to your server!
+<br><br>
 ## FAQ
 
+
 #### In which folder do I upload my files for my site?
 The "www" folder is used as a public folder. There you can add your PHP, HTML, CSS, JS and so on files that are required for the public or for the operation of the site.
-
+<br><br>
 ## How do I use Git support?
 
 #### Instructions for Git support
@@ -83,7 +129,7 @@ Furthermore, if not already done, adjust to your domain:
 ```bash
 server_name www.example.com;
 ```
-
+<br><br>
 ## Change PHP version
 
 Changing the PHP version is currently still somewhat cumbersome. A revised version will be available in the future.
@@ -101,7 +147,7 @@ Changing the PHP version is currently still somewhat cumbersome. A revised versi
 ---
 
 - **Step 3:** Restart your container.
-
+<br><br>
 ## PHP extensions
 
 PHP extensions of PHP version 8.3:
@@ -111,7 +157,7 @@ Core, date, libxml, openssl, pcre, zlib, filter, hash, json, random, Reflection,
 ```
 
 Small differences in the extensions between the PHP versions.
-
+<br><br>
 ## License
 
 [MIT License](https://choosealicense.com/licenses/mit/)

cloudflared.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# [Tunnel] Check if cloudflared_token.txt exists and has content
+if [ -s "/home/container/cloudflared_token.txt" ]; then
+    # If the file has content, start cloudflared using the content as the token
+    echo "[Tunnel] Starting cloudflared tunnel with token"
+    cloudflared tunnel --no-autoupdate run --token "$(cat /home/container/cloudflared_token.txt)" > /dev/null 2>&1 &
+
+    # Wait for the tunnel to start
+    echo "[Tunnel] Waiting for cloudflared tunnel to start..."
+    
+    # Set max number of attempts
+    MAX_ATTEMPTS=10
+    ATTEMPT=0
+
+    # Check if cloudflared is running, repeat every 1 second until it is or max attempts reached
+    while ! pgrep -x "cloudflared" > /dev/null && [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
+        ATTEMPT=$((ATTEMPT + 1))
+        sleep 1
+    done
+
+    # If cloudflared is running
+    if pgrep -x "cloudflared" > /dev/null; then
+        # Green success message
+        echo -e "[Tunnel]\033[0;32m Cloudflared tunnel is running successfully.\033[0m"
+    else
+        echo -e "[Tunnel]\033[0;31m Failed to start cloudflared tunnel after $MAX_ATTEMPTS attempts. Exiting...\033[0m"
+        exit 1
+    fi
+
+else
+    echo "[Tunnel]\033[0;31m cloudflared_token.txt is empty or does not exist. Skipping cloudflared startup.\033[0m"
+fi