Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
90f5d6b
Upgrade to PHP 8.3 & Laravel 10
jwhulette Feb 18, 2024
6cf31d4
Fixed PHPUnit upgrade issue.
jwhulette Feb 18, 2024
13145d1
Removed dev section from README.md
jwhulette Feb 18, 2024
950b94b
Update docker-compose.yml
jwhulette Feb 18, 2024
8371c9e
Updated ide helper
jwhulette Feb 18, 2024
65a3973
Dusk tests
jwhulette Feb 18, 2024
b7ee90b
Remove current docker implementation
jwhulette Feb 18, 2024
e719f22
wip
jwhulette Feb 19, 2024
c52d982
Fix GH tests
jwhulette Mar 24, 2024
f35c0f4
Fix GH action failing
jwhulette May 12, 2024
1345012
(ignore) Apply style fixes
jwhulette May 12, 2024
fa394aa
Add migrations to testing
jwhulette May 12, 2024
d740870
Added seeder
jwhulette May 12, 2024
c3aece0
Fixed routing
jwhulette May 12, 2024
a8541db
Composer updates
jwhulette May 12, 2024
a011f36
Fix gh test
jwhulette Jun 1, 2024
97de294
Dusk issues
jwhulette Jun 1, 2024
beb7d67
wip
jwhulette Jun 1, 2024
df66187
Updates
jwhulette Mar 22, 2025
2d5d90a
wip
jwhulette Mar 23, 2025
5add5b8
Update APP_URL in test.yml to remove port number
jwhulette Oct 19, 2025
95d2e05
Update environment configuration in .env.example and test.yml
jwhulette Oct 19, 2025
b0d316f
Add VITE_REVERB configuration to test.yml
jwhulette Oct 19, 2025
8c3704b
Add Vite environment variables to test.yml
jwhulette Oct 19, 2025
21f8e8a
Update .env.example and test.yml with Reverb configuration
jwhulette Oct 19, 2025
7b2a3e0
Add test execution steps to CI workflow in test.yml
jwhulette Oct 19, 2025
082aa68
Add .env.dusk.ci for testing and update test.yml to use it
jwhulette Oct 19, 2025
ffa0ccd
Remove unnecessary directory permissions step and increase wait time …
jwhulette Oct 19, 2025
83570d9
Fix comments in Players.vue, clean up routes in web.php, and increase…
jwhulette Oct 19, 2025
b9d8adb
Add dusk-test.yml for Dusk testing and streamline test.yml by removin…
jwhulette Oct 19, 2025
129ccf7
Rename test name to 'Dusk Test' and streamline environment variable s…
jwhulette Oct 19, 2025
1bab63b
Increase wait time for text assertions in JoinRoomTest to improve rel…
jwhulette Oct 19, 2025
1e2730d
Enable debug mode for Reverb Server in dusk-test.yml for improved tro…
jwhulette Oct 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .dev-init.sh

This file was deleted.

67 changes: 67 additions & 0 deletions .docker/local/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
FROM amazonlinux:2023

RUN dnf upgrade
RUN dnf install -y pip \
&& pip install supervisor

COPY .docker/local/supervisor/supervisord.service /lib/systemd/system/supervisord.service
COPY .docker/local/supervisor/supervisor.conf /etc
COPY .docker/local/supervisor/supervisor.ini /etc/supervisord.d/supervisor.ini

RUN mkdir -p /var/log/supervisor/
RUN mkdir -p /var/run/supervisor/

#RUN systemctl daemon-reload
#RUN systemctl enable supervisord
#RUN systemctl start supervisord

# Install php
RUN dnf install -y php8.3 \
php8.3-opcache \
php8.3-common \
php8.3-zip \
php8.3-intl \
php8.3-mbstring \
php8.3-sodium

# Install composer
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer

#FROM ubuntu:22.04 as build
#
#
## Setup for for PHP 8.3
#RUN apt update && \
# apt upgrade && \
# apt install ca-certificates apt-transport-https software-properties-common lsb-release -y && \
# add-apt-repository ppa:ondrej/php -y && \
# apt update
#
#ENV DEBIAN_FRONTEND=noninteractive
#
#RUN apt-get install php8.3 -y
#
#RUN apt-get install -y php8.3-bcmath \
# php8.3-curl \
# php8.3-zip \
# php8.3-intl \
# php8.3-mbstring \
# php8.3-sqlite3
#
# # Update php.ini configs
# ENV PHP_INI_DIR=/etc/php/8.3/cli
#RUN sed -E -i -e 's/opcache.enable=0/opcache.enable=1/' $PHP_INI_DIR/php.ini \
# && sed -E -i -e 's/opcache.enable_cli=0/opcache.enable_cli=1/' $PHP_INI_DIR/php.ini \
# # && sed -E -i -e 's/opcache.memory_consumption=192/opcache.memory_consumption=192/' $PHP_INI_DIR/php.ini \
# # Determine how many files does your project have? find . -type f -print | grep php | wc -l
# # The actual value used will be the first number in the set of prime numbers
# # { 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987 } that is greater than or equal to the configured value
# && sed -E -i -e 's/opcache.max_accelerated_files=1000000/opcache.max_accelerated_files=65407/' $PHP_INI_DIR/php.ini \
# # For Development / testing, keep 1
# # For performance / production, keep 0
# && sed -E -i -e 's/opcache.validate_timestamps=0/opcache.validate_timestamps=1/' $PHP_INI_DIR/php.ini
#
#COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
#
## Copy files into image
#COPY --chown=www-data:www-data ./ /var/www/html
56 changes: 56 additions & 0 deletions .docker/local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
services:
simple_pointer:
entrypoint: tail -f /dev/null
build:
context: ../..
dockerfile: ./.docker/local/Dockerfile
container_name: simple_pointer
volumes:
- ~/Sites/Projects/SimplePointer:/var/www/html:delegated
ports:
- 80:80
- 443:443
networks:
- laravel

# supervisor:
# build:
# context: ../..
# dockerfile: ../supervisor/Dockerfile
# container_name: supervisor
# volumes:
# - ./:/var/www/html:delegated
# depends_on:
# - app
# ports:
# - "6001:6001"
# networks:
# - laravel

# nginx:
# image: nginx:stable-alpine
# container_name: nginx
# ports:
# - 80:80
# - 9515:9515
# - 8080:8080
# - 5173:5173
# volumes:
# - ./public:/var/www/html/public:delegated
# - ./.docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
# networks:
# - laravel

# Used when running dusk tests
# selenium:
# image: 'selenium/standalone-chrome'
# container_name: selenium
# volumes:
# - '/dev/shm:/dev/shm'
# links:
# - 'nginx:simplepointer.test'
# networks:
# - laravel

networks:
laravel:
21 changes: 21 additions & 0 deletions .docker/local/supervisor/supervisord.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[unix_http_server]
file=/var/run/supervisor/supervisor.sock ; (the path to the socket file)

[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB)
logfile_backups=10 ; (num of main logfile rotation backups;default 10)
loglevel=info ; (log level;default info; others: debug,warn,trace)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
nodaemon=false ; (start in foreground if true;default false)
minfds=1024 ; (min. avail startup file descriptors;default 1024)
minprocs=200 ; (min. avail process descriptors;default 200)

[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

[supervisorctl]
serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL for a unix socket

[include]
files = supervisord.d/*.ini
6 changes: 3 additions & 3 deletions .docker/supervisor/supervisord.conf → .docker/local/supervisor/supervisord.ini
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[supervisord]
user=root
nodaemon=true
logfile=/dev/null
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid

Expand All @@ -13,9 +13,9 @@ autorestart=true
user=www-data
numprocs=1

[program:websockets]
[program:reverb]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan websockets:serve
command=php /var/www/html/artisan reverb:start --debug
numprocs=1
autostart=true
autorestart=true
Expand Down
10 changes: 10 additions & 0 deletions .docker/local/supervisor/supervisord.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
Description=Process Monitoring and Control Daemon
After=rc-local.service nss-user-lookup.target

[Service]
Type=forking
ExecStart=/usr/local/bin/supervisord -c /etc/supervisord.conf

[Install]
WantedBy=multi-user.target
57 changes: 0 additions & 57 deletions .docker/nginx/nginx.conf

This file was deleted.

19 changes: 0 additions & 19 deletions .docker/php-fpm/Dockerfile

This file was deleted.

5 changes: 3 additions & 2 deletions .docker/supervisor/Dockerfile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM php:7.4-fpm-alpine
FROM php:8.4-cli-alpine

WORKDIR /var/www/html

RUN apk --update add supervisor \
libzip-dev \
zip \
&& docker-php-ext-install zip
&& docker-php-ext-install zip \
pcntl

RUN rm /var/cache/apk/* && \
mkdir -p /var/www/html
Expand Down
35 changes: 34 additions & 1 deletion .dockerignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1 +1,34 @@
.git
# Include any files or directories that you don't want to be copied to your
# container here (e.g., local build artifacts, temporary files, etc.).
#
# For more help, visit the .dockerignore file reference guide at
# https://docs.docker.com/engine/reference/builder/#dockerignore-file

**/.DS_Store
**/__pycache__
**/.venv
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/bin
**/charts
**/docker-compose*
**/compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
Empty file modified .editorconfig
100644 → 100755
Empty file.
30 changes: 18 additions & 12 deletions .env.dusk.ci
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
APP_NAME=SimplePointer
APP_ENV=ci
APP_ENV=testing
APP_KEY=base64:z+8HOe9OXmUftIVaBkdTWByv8DDBXKX2pw6l5rwzufA=

APP_DEBUG=false
APP_DEBUG=true

APP_URL=http://127.0.0.1:8000
DUSK_DRIVER=chrome
DUSK_HEADLESS_DISABLED=false

LOG_CHANNEL=stack

DB_CONNECTION=sqlite
DB_DATABASE=database.sqlite

BROADCAST_DRIVER=pusher
CACHE_DRIVER=file
QUEUE_CONNECTION=database
SESSION_DRIVER=cookie
SESSION_DRIVER=file
SESSION_LIFETIME=120
SESSION_SECURE_COOKIE=false

PUHSER_HOST=127.0.0.1
PUSHER_APP_ID=aCAvGIXkcbawZl5
PUSHER_APP_KEY=j1KfhDWAamyjYCX
PUSHER_APP_SECRET=Rb2YYcU2pqQFHLzEwVRQ
PUSHER_APP_CLUSTER=mt1
BROADCAST_DRIVER=reverb
REVERB_APP_ID=383604
REVERB_APP_KEY=nxwjzn6y1tmarsc7kmpu
REVERB_APP_SECRET=buik4yvca1kyo4gmkapq
REVERB_SERVER_HOST=0.0.0.0
REVERB_HOST=1270.0.0.1
REVERB_PORT=8080
REVERB_SCHEME=http

MIX_USE_LOCAL=true
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
VITE_REVERB_APP_KEY="${REVERB_APP_KEY}"
VITE_REVERB_HOST="${REVERB_HOST}"
VITE_REVERB_PORT="${REVERB_PORT}"
VITE_REVERB_SCHEME="${REVERB_SCHEME}"
Loading
Loading