Configures CI for Bref and Vapor testing

Sets up a GitHub Actions workflow to run tests on Bref and Vapor platforms.

This commit introduces a new GitHub Action that builds Docker images for Bref and Vapor based on the provided PHP and Laravel versions, and then executes tests within those containers. This ensures that the package functions correctly on both platforms.

Also, includes docker-compose and related files to set up local testing environments.

Author: datpmwork

.dockerignore

@@ -1,3 +1,5 @@
 vendor/
-test-app/vendor/
 package/
+build/
+.phpunit.cache/
+.git/

.github/actions/test-action/action.yaml

@@ -15,14 +15,21 @@ inputs:
 runs:
   using: 'composite'
   steps:
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.php-version }}
+        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
+        coverage: none
+
     - name: Set environment variables
       shell: bash
       run: |
-        php_version="${{ inputs.php-version }}"
+        PHP_VERSION_TAG="${{ inputs.php-version }}"
         laravel_version="${{ inputs.laravel-version }}"
         platform="${{ inputs.platform }}"
 
-        php_tag="${php_version//./}"
+        php_tag="${PHP_VERSION_TAG//./}"
         laravel_tag="${laravel_version//[.*]/}"
 
         # Convert to numbers and calculate port: 9090 + php_tag + laravel_tag
@@ -36,95 +43,30 @@ runs:
           port=$base_port
         fi
 
-        echo "PHP_VERSION=$php_version" >> $GITHUB_ENV
+        echo "PHP_VERSION_TAG=$PHP_VERSION_TAG" >> $GITHUB_ENV
         echo "LARAVEL_VERSION=$laravel_version" >> $GITHUB_ENV
-        echo "PHP_TAG=$php_tag" >> $GITHUB_ENV
+        echo "PHP_VERSION=$php_tag" >> $GITHUB_ENV
         echo "LARAVEL_TAG=$laravel_tag" >> $GITHUB_ENV
         echo "SLS_TINKER_LAMBDA_ENDPOINT=http://localhost:$port" >> $GITHUB_ENV
         echo "PORT=$port" >> $GITHUB_ENV
         echo "PLATFORM=$platform" >> $GITHUB_ENV
+        echo "DOCKER_IMAGE=${{ inputs.platform }}-$php_tag-$laravel_tag" >> $GITHUB_ENV
 
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ inputs.php-version }}
-        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
-        coverage: none
-
-    - name: Install dependencies & Laravel App
+    - name: Create App
       shell: bash
       run: |
-        composer create-project "laravel/laravel:${{ inputs.laravel-version }}" --no-interaction app
-        cd app
-        php artisan key:generate
-
-    - name: Install Bref
-      if: inputs.platform == 'bref'
-      shell: bash
-      run: |
-        cd app
-        composer require bref/bref:^2 --no-interaction
-
-    - name: Install Vapor Core
-      if: inputs.platform == 'vapor'
-      shell: bash
-      run: |
-        cd app
-        composer require laravel/vapor-core --no-interaction
-        composer global require laravel/vapor-cli
-        mkdir -p ~/.laravel-vapor
-        cat <<EOF > ~/.laravel-vapor/config.json
-        {
-            "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiIxIiwianRpIjoiMDdjMmVlODhmYzkyNjQyNjg1YWI5N2FhMjIzNGU2MjYwZWMyM2RjYWQzYjJmOWM0YjVlY2JjY2YwZTU3MzJhNDI3NDRiZDI1NWIwYjg0NDEiLCJpYXQiOjE3NTUzNjQzOTIuMTE3NzExLCJuYmYiOjE3NTUzNjQzOTIuMTE3NzE0LCJleHAiOjE5MTMxMzA3OTIuMTA3ODU3LCJzdWIiOiI2ODk5OSIsInNjb3BlcyI6WyIqIl19.Ma0-GJjBvqs2irvHbW5oOrEJn0I-FCjSXV-zK20LIzwbgSfZNTMvViheazfO1roOow1UyANmzoPGnTyo2EndFM6G0p-UDiB03ce-36Bgj7JKOJ_156omPXsqrPhN7P9nDER1zmas9gM4UHwlHW2k67U9v050FjVT_TBeFvVe6gtWPKLZdTLTT5xmaqZvnAWbNUO_wq4exnmPnzFYVXpDYuuD2fgtzPXAzXauvm1BGR4YBMGvzSx1JCyc-OBnEwdsQIMAomU6lHrybQJzYefHugNx6oHIe2BQtMblsWQOPPSRqD5ciGTnzWdQ1PxBYd7FS3jWRoqv4FWJuTJo7krIPYiBfQtsUXaCnzOyx8pLpFiOCQE5HeldtdmT4KH5VXkYWsZKoA3_gdnTwyeoBaP8TvKt0mE6a6mQhMzasUkPk8-lASsRBHti5dqEu8FEQWWdEGm4--fzH7bN7i2vMsR9nUCXrJx0lLL7e3VL9j6igAKqQssK8gkxhd4q38g1L2esbdkNa6nbv8fGfPaWcOlbEyKog19pRIblCDj3wdtXNJjts1FNmxNSeYuxjKh5Wselx_PRkhLEbFoAIMmWbBEGdVC0p_gByt7yL3-wOFD69PA2SoctyoSKnae9E7w6V_OeDKrcXimbZugW6O0oCLbzhFslcZ0rMbaN0W3r-CRYUDA",
-            "team": 83505
-        }
-        EOF
-
-    - name: Install package from local path
-      shell: bash
-      working-directory: app
-      run: |
-        # Add local package to composer.json
-        composer config repositories.local path ../package
-        composer require datpmwork/sls-tinker:@dev
-        rm -rf vendor/datpmwork/sls-tinker
-        cp -r ../package vendor/datpmwork/sls-tinker
-
-    - name: Vapor Build
-      shell: bash
-      working-directory: app
-      if: inputs.platform == 'vapor'
-      run: |
-        cat <<EOF > vapor.yml
-        id: 72679
-        name: vapor
-        environments:
-          production:
-            memory: 1024
-            cli-memory: 512
-            runtime: 'php-8.4:al2'
-            build:
-              - 'rm -rf bootstrap/cache/*'
-              - 'composer install --no-dev'
-              - 'php artisan event:cache'
-                # - 'npm ci && npm run build && rm -rf node_modules'
-        EOF
-        ~/.composer/vendor/bin/vapor build production || exit 0
+        docker build --build-arg PHP_VERSION_TAG=$PHP_VERSION_TAG \
+                     --build-arg PHP_VERSION=$PHP_VERSION \
+                     --build-arg PHP_LARAVEL_TAG=$LARAVEL_VERSION \
+                     -t $DOCKER_IMAGE -f Dockerfile --target ${{ inputs.platform }} .
 
     - name: Create Docker Instance
       shell: bash
       run: |
-        if [[ "${{ inputs.platform }}" == "bref" ]]; then
-          docker build -t ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG -f package/tests/Dockerfile --build-arg PHP_VERSION=$PHP_TAG --target ${{ inputs.platform }} .
-          docker run -d --rm -p $PORT:8080 --name ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG artisan
-        elif [[ "${{ inputs.platform }}" == "vapor" ]]; then
-          docker build -t ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG -f package/tests/Dockerfile --build-arg PHP_VERSION=$PHP_TAG --target ${{ inputs.platform }} .
-          docker run -d --rm -p $PORT:8080 -e VAPOR_SSM_PATH=test -e LAMBDA_TASK_ROOT=/var/task -e APP_RUNNING_IN_CONSOLE=true --name ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG artisan
-        fi
+        docker run -d --rm -p $PORT:8080 --name $DOCKER_IMAGE $DOCKER_IMAGE artisan
 
     - name: Execute tests
       shell: bash
-      working-directory: package
       run: |
         composer install
         php vendor/bin/testbench package:sync-skeleton
@@ -134,4 +76,4 @@ runs:
       if: always()
       shell: bash
       run: |
-        docker stop ${{ inputs.platform }}-$PHP_TAG-$LARAVEL_TAG
+        docker stop ${{ inputs.platform }}-$PHP_VERSION-$LARAVEL_TAG

.github/workflows/run-tests.yml

@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
-        laravel: [ 10.*, 11.*, 12.* ]
+        php: [ 8.1 ]
+        laravel: [ 10.* ]
         stability: [ prefer-stable ]
         exclude:
           # Laravel 11 requires PHP 8.2+
@@ -24,11 +24,9 @@ jobs:
     steps:
       - name: Checkout package code
         uses: actions/checkout@v4
-        with:
-          path: ./package
 
       - name: Run tests
-        uses: ./package/.github/actions/test-action
+        uses: ./.github/actions/test-action
         with:
           php-version: ${{ matrix.php }}
           laravel-version: ${{ matrix.laravel }}
@@ -40,8 +38,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
-        laravel: [ 10.*, 11.*, 12.* ]
+        php: [ 8.1 ]
+        laravel: [ 10.* ]
         stability: [ prefer-stable ]
         exclude:
           # Laravel 11 requires PHP 8.2+
@@ -55,11 +53,9 @@ jobs:
     steps:
       - name: Checkout package code
         uses: actions/checkout@v4
-        with:
-          path: ./package
 
       - name: Run tests
-        uses: ./package/.github/actions/test-action
+        uses: ./.github/actions/test-action
         with:
           php-version: ${{ matrix.php }}
           laravel-version: ${{ matrix.laravel }}

Dockerfile

@@ -1,16 +1,53 @@
-FROM bref/php-82-console:2
+ARG PHP_VERSION=82
+ARG PHP_VERSION_TAG=8.2
+ARG LARAVEL_VERSION=10.0
+
+FROM bref/php-${PHP_VERSION}-console:2 AS bref
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-COPY --from=bref/extra-xdebug-php-82:1.8.2 /opt /opt
 
-COPY composer.json /var/package/
-COPY config/ /var/package/config/
-COPY src/ /var/package/src/
+COPY . /tmp/package
+ENV COMPOSER_MIRROR_PATH_REPOS=1
+RUN composer create-project "laravel/laravel:${LARAVEL_VERSION}" --no-interaction . && \
+    composer config repositories.local path /tmp/package && \
+    composer require datpmwork/sls-tinker:@dev && \
+    composer require bref/bref:^2 --no-interaction
+
+FROM laravelphp/vapor:php${PHP_VERSION} AS vapor
+
+# Expose port 8080 for RIE
+EXPOSE 8080
+
+WORKDIR /var/task
 
-COPY composer.json ./
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+# Download and install AWS Lambda Runtime Interface Emulator
+RUN curl -Lo /opt/aws-lambda-rie \
+    https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/download/v1.27/aws-lambda-rie && \
+    chmod +x /opt/aws-lambda-rie
 
-RUN composer install --no-autoloader --no-scripts
+COPY docker/vapor/bootstrap /opt/bootstrap
+COPY docker/vapor/entrypoint.sh /opt/entrypoint.sh
 
-COPY . /var/task
+COPY . /tmp/package
+ENV COMPOSER_MIRROR_PATH_REPOS=1
+RUN composer create-project "laravel/laravel:${LARAVEL_VERSION}" --no-interaction . && \
+    composer config repositories.local path /tmp/package && \
+    composer require datpmwork/sls-tinker:@dev && \
+    composer require laravel/vapor-core --no-interaction && \
+    cp vendor/laravel/vapor-core/stubs/cliRuntime.php cliRuntime.php && \
+    cp vendor/laravel/vapor-core/stubs/runtime.php runtime.php
 
 RUN composer dump-autoload
+
+# Make entrypoint executable
+RUN chmod +x /opt/entrypoint.sh
+# Make bootstrap executable
+RUN chmod +x /opt/bootstrap
+# Set the CMD to use our entrypoint
+ENTRYPOINT ["/opt/entrypoint.sh"]
+
+ENV LAMBDA_TASK_ROOT=/var/task
+ENV APP_RUNNING_IN_CONSOLE=true
+ENV VAPOR_SSM_PATH=test

Makefile

@@ -0,0 +1,7 @@
+up:
+	@echo "Starting up the application..."
+	@docker compose up -d
+
+build-app:
+	@echo "Building the application..."
+	docker compose build

docker-compose.yaml

@@ -4,21 +4,46 @@ services:
     networks:
       - net
 
-  test-app:
-    image: sls-tinker-test-app
-    container_name: sls-tinker-test-app
+  bref-app:
+    image: bref-app
+    container_name: bref-app
     build:
       context: .
       dockerfile: Dockerfile
+      target: bref
+      args:
+        PHP_VERSION_TAG: ${PHP_VERSION_TAG:-81}
+        PHP_VERSION: ${PHP_VERSION:-8.1}
+        PHP_LARAVEL_TAG: ${PHP_LARAVEL_TAG:-11.*}
     networks:
       - net
     ports:
       - 9090:8080
     volumes:
       - ./src:/var/task/vendor/datpmwork/sls-tinker/src
-      - ./test-app/php:/var/task/php/
     command:
       - artisan
+
+  vapor-app:
+    image: vapor-app
+    container_name: vapor-app
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: vapor
+      args:
+        PHP_VERSION_TAG: ${PHP_VERSION_TAG:-81}
+        PHP_VERSION: ${PHP_VERSION:-8.1}
+        PHP_LARAVEL_TAG: ${PHP_LARAVEL_TAG:-11.*}
+    networks:
+      - net
+    ports:
+      - 9091:8080
+    volumes:
+      - ./src:/var/task/vendor/datpmwork/sls-tinker/src
+    command:
+      - artisan
+
 networks:
   net:
     driver: "bridge"

docker/vapor/bootstrap

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while true
+do
+    php /opt/bootstrap.php
+done

docker/vapor/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Check if we're running locally with RIE
+if [ -z "$AWS_LAMBDA_RUNTIME_API" ]; then
+    echo "Running locally with AWS Lambda RIE"
+    exec /opt/aws-lambda-rie /opt/bootstrap
+else
+    echo "Running in AWS Lambda environment"
+    exec /opt/bootstrap
+fi