Merge pull request #4 from fortrabbit/cleanup

Cleanup

Author: erinbit

.dockerignore

@@ -0,0 +1,13 @@
+/.dockerignore
+/.github/
+/.gitattributes
+/.gitignore
+/composer.lock
+/docker-compose.yml
+/docker/Dockerfile
+/fortrabbit-post.php
+/fortrabbit-pre.php
+/fortrabbit.yml
+/Justfile
+/storage/
+/vendor/

.env.example

@@ -1,60 +1,18 @@
-APP_NAME=Laravel
+APP_DEBUG=true
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-LOG_DEPRECATIONS_CHANNEL=null
-LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=mysql
 DB_PORT=3306
-DB_DATABASE=laravel
+DB_DATABASE=testrabbit
 DB_USERNAME=root
-DB_PASSWORD=
+DB_PASSWORD=pwd
 
 MONGODB_CONNECTION="mongodb+srv://testrabbit:[email protected]/test?retryWrites=true&w=majority"
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-FILESYSTEM_DRIVER=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
 MEMCACHED_HOST=127.0.0.1
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=smtp
-MAIL_HOST=mailhog
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-# Sets parameters for testing based on platform.
-# E.g. new platform supports more image formats.
-# Options: current, new
-# Default: current
-FRBIT_PLATFORM=current
+APP_TYPE=pro
+FRBIT_PLATFORM=ubuntu22

.gitattributes

@@ -1,5 +1 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
-CHANGELOG.md export-ignore

.github/workflows/deploy.yml

@@ -6,62 +6,55 @@ env:
 
 on:
   push:
-    branches:
-      - master
-      - develop
-      - production
-    tags:
-      - '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-?*'
 
 jobs:
 
   test:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['7.4','8.0','8.1','8.2']
+        php-version: ['7.4','8.0','8.1','8.2','8.3','8.4']
 
     steps:
       - uses: actions/checkout@v3
 
-      -   name: Login to GitHub Container Registry
-          uses: docker/login-action@v2
-          with:
-            registry: ghcr.io
-            username: ${{ github.repository_owner }}
-            password: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Login to GitHub Container Registry
+#        uses: docker/login-action@v2
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.repository_owner }}
+#          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build docker image using Github Packages as cache
         env:
           PHP_VERSION: ${{ matrix.php-version }}
         run: |
-          docker pull $DOCKER_REGISTRY_IMAGE:${PHP_VERSION} || true
-          cd docker/$PHP_VERSION
-          docker build --build-arg PHP_VERSION=${PHP_VERSION} \
-            --cache-from $DOCKER_REGISTRY_IMAGE:${PHP_VERSION} \
+          docker build \
+            --file docker/Dockerfile \
+            --build-arg PHP_VERSION=${PHP_VERSION} \
             --tag $DOCKER_REGISTRY_IMAGE:${PHP_VERSION} \
-            --tag $DOCKER_REGISTRY_IMAGE:latest .
-          docker push $DOCKER_REGISTRY_IMAGE:${PHP_VERSION}
+            .
 
-      - name: Cache vendor folder
-        uses: actions/cache@v3
-        with:
-          path: vendor
-          key: vendor-${{ matrix.php-version }}-${{ hashFiles('composer.lock') }}
+#      - name: Cache vendor folder
+#        uses: actions/cache@v3
+#        with:
+#          path: vendor
+#          key: vendor-${{ matrix.php-version }}-${{ hashFiles('composer.lock') }}
 
-      - name: Install dependencies
-        run: |
-          docker run --rm \
-            -v $PWD:/var/www/html \
-            $DOCKER_REGISTRY_IMAGE:${{ matrix.php-version }} \
-            bash -c '\
-            composer config -g github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }} && \
-            composer install --no-interaction --prefer-dist --no-scripts --no-cache'
+#      - name: Install dependencies
+#        run: |
+#          docker run --rm \
+#            -v $PWD:/var/www/html \
+#            $DOCKER_REGISTRY_IMAGE:${{ matrix.php-version }} \
+#            bash -c '\
+#            composer config -g github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }} && \
+#            composer install --no-interaction --prefer-dist --no-scripts --no-cache'
 
 
   usx:
     runs-on: ubuntu-22.04
     needs: test
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     steps:
       -   name: Checkout
           uses: actions/checkout@v3
@@ -88,6 +81,7 @@ jobs:
   eu2:
     runs-on: ubuntu-22.04
     needs: test
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     steps:
       -   name: Checkout
           uses: actions/checkout@v3
@@ -115,6 +109,7 @@ jobs:
   us1:
     runs-on: ubuntu-22.04
     needs: test
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     steps:
       -   name: Checkout
           uses: actions/checkout@v3

.gitignore

@@ -3,6 +3,7 @@
 /public/hot
 /public/storage
 /public/imagick/tmp/
+/public/gd/tmp
 
 /storage/*.key
 /vendor
@@ -19,3 +20,6 @@ yarn-error.log
 
 /.idea
 /.vscode
+
+# Ignore so install works on many different PHP versions
+/composer.lock

.styleci.yml

@@ -0,0 +1,44 @@
+default: start
+
+start: build
+    docker-compose --progress=plain up -d --remove-orphans
+
+stop:
+    docker-compose down
+
+build:
+    #!/usr/bin/env bash
+    if [ -z "$GITHUB_ACTIONS" ]; then
+        docker-compose --progress=plain build
+    fi
+
+# Composer install is run inside the test containers instead
+#install: build
+#    #!/usr/bin/env bash
+#    rm composer.lock
+#    if [ -n "$GITHUB_ACTIONS" ]; then
+#        docker-compose run --rm php81 bash -c '\
+#          composer config -g github-oauth.github.com ${GITHUB_AUTH} && \
+#          composer install --no-interaction --prefer-dist --no-scripts --no-cache'
+#    else
+#        docker-compose run --rm php81 composer install
+#    fi
+
+test:
+    #!/usr/bin/env bash
+    set -e
+    for port in 8074 8080 8081 8082 8083 8084; do
+        echo "--- Testing on port $port ---"
+        response=$(curl -fsSL "http://localhost:$port/tests/MySQL")
+
+        # Print the JSON structure without the message
+        echo "$response" | jq 'del(.message)'
+
+        # The actual test to verify success
+        echo "$response" | grep -q '"success":true'
+    done
+    echo "All tests passed!"
+
+clean:
+    rm -f public/imagick/tmp/img.*
+    rm -f public/gd/tmp/img.*

Justfile

@@ -1,24 +1,26 @@
 # Test Rabbit
 
-This is a repo that when deployed as a fortrabbit App uses all common features of the platform. It has an automatic test suite that is run whenever you visit the main page of the app.
+This is a repo that when deployed as a fortrabbit App uses all common features of the platform. 
+It has an automatic test suite that is run whenever you visit the main page of the app.
 
-## Local environment
+This test app is designed to work on all supported PHP versions.
 
-```bash
-docker-compose up -d
-```
 
-or
+## Local environment
 
 ```bash
-sail up -d
+just start
 ```
 
+
 ## Deployment
 
-This repo is already deployed to Apps in all regions and whenever you push to the `master` branch on github, a Github Action is triggered that deploys that commit to the live apps.
+This repo is already deployed to Apps in all regions. 
+Whenever you push to the `master` branch on GitHub, 
+a GitHub Action is triggered that deploys that commit to the live apps.
 
-Further documentation for current platform: https://www.notion.so/fortrabbit/testrabbit-237ed2d09f6280a49ca8dfdced0310a4?source=copy_link
+Further documentation for current platform: 
+https://www.notion.so/fortrabbit/testrabbit-237ed2d09f6280a49ca8dfdced0310a4
 
 
 ### Initial setup for a new App

Makefile

@@ -14,14 +14,12 @@
         "laravel/framework": "^8.75",
         "laravel/sanctum": "^2.11",
         "laravel/tinker": "^2.5",
-        "mongodb/mongodb": "1.10"
+        "mongodb/mongodb": "*"
     },
     "require-dev": {
         "facade/ignition": "^2.5",
         "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10",
-        "phpunit/phpunit": "^9.5.10"
+        "nunomaduro/collision": "^5.10"
     },
     "autoload": {
         "psr-4": {
@@ -30,11 +28,6 @@
             "Database\\Seeders\\": "database/seeders/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
@@ -50,18 +43,10 @@
             "@php artisan key:generate --ansi"
         ]
     },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true,
-        "platform": {
-            "php": "7.4"
-        }
+        "sort-packages": true
     },
     "minimum-stability": "dev",
     "prefer-stable": true