configuração de docker para o projeto e dusk instalado

.env.example

@@ -1,25 +1,25 @@
-APP_NAME=Laravel
+APP_NAME=Salas
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://127.0.0.1:8000
+APP_URL=http://salas
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_CONNECTION=mariadb
+DB_HOST=mariadb
 DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=salas
+DB_USERNAME=salas
+DB_PASSWORD=salas
 
 # Em produção,depende de Supervisor instalado para processar a fila.
 # Em ambiente dev, pode subir um processo com
 # php artisan queue:listen
 # ou usar
-# QUEUE_CONNECTION=sync
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=sync
+#QUEUE_CONNECTION=database
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -52,9 +52,11 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-SENHAUNICA_KEY=
-SENHAUNICA_SECRET=
-SENHAUNICA_CALLBACK_ID=
+SENHAUNICA_KEY=faker
+SENHAUNICA_SECRET=faker
+SENHAUNICA_CALLBACK_ID=1
+SENHAUNICA_ADMINS=111111
+SENHAUNICA_DEV="http://auth.local:3141/wsusuario/oauth"
 
 REPLICADO_HOST=
 REPLICADO_PORT=
@@ -63,8 +65,7 @@ REPLICADO_USERNAME=
 REPLICADO_PASSWORD=
 REPLICADO_CODUNDCLG=
 REPLICADO_SYBASE=
-
-SENHAUNICA_ADMINS=
+REPLICADO_FAKE=1
 
 # SENHAUNICA-SOCIALITE ######################################
 # https://github.com/uspdev/senhaunica-socialite
@@ -94,7 +95,7 @@ SENHAUNICA_ADMINS=
 # Código da unidade para identificar os logins próprios ou de outras unidades
 SENHAUNICA_CODIGO_UNIDADE=
 
-USP_THEME_SKIN=fflch
+USP_THEME_SKIN=uspdev
 
 # LARAVEL TOOLS #########################################
 # https://github.com/uspdev/laravel-tools
@@ -125,3 +126,7 @@ CALENDARIO_HORA_FINAL=
 # upload_max_filesize e post_max_size
 # Definir o parâmetro em MB, o padrão aqui é 16MB (se não estiver definido valor algum)
 UPLOAD_MAX_FILESIZE=16
+
+DUSK_DRIVER_URL='http://selenium:4444/wd/hub'
+DUSK_START_MAXIMIZED=true
+DUSK_HEADLESS_DISABLED=true

Dockerfile

@@ -1,60 +1,15 @@
-FROM php:8.3-apache
+FROM uspdev/uspdev-php-apache:8.3
 
-# packages
-RUN sed -i 's|main|main non-free|' /etc/apt/sources.list.d/debian.sources && apt-get update && apt-get install -y \
-    unixodbc \
-    unixodbc-dev \
-    freetds-bin \
-    freetds-dev \
-    libicu-dev \
-    git \
-    unzip \
-    libzip-dev \
-    libpng-dev \
-    libonig-dev \
-    libxml2-dev \
-    libjpeg-dev \
-    libpng-dev \
-    libfreetype6-dev \ 
-    curl
+RUN sed -i 's|/var/www/html|/var/www/html/public|' \
+    /etc/apache2/sites-available/000-default.conf
 
-# cleanup
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-
-# php libs
-RUN docker-php-ext-install \
-    intl \
-    pdo_mysql \
-    soap \
-    zip \
-    mbstring \
-    bcmath \
-    pdo_dblib
-
-# gd
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg && \
-    docker-php-ext-install gd
-
-# php memory
-ENV PHP_MEMORY_LIMIT=512M
-ENV PHP_UPLOAD_LIMIT=512M
-RUN { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
-    } > "${PHP_INI_DIR}/conf.d/upload.ini"
-
-# apache
-RUN a2enmod rewrite
-RUN sed -i 's|/var/www/html|/var/www/html/public|' /etc/apache2/sites-available/000-default.conf
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# composer
 USER www-data
+
 COPY --chown=www-data . .
-RUN composer install --optimize-autoloader --no-interaction
 
-CMD ["./serve.sh"]
+RUN composer install \
+    --no-dev \
+    --optimize-autoloader \
+    --no-interaction
+
+CMD ["apache2-foreground"]

Dockerfile-old

@@ -0,0 +1,60 @@
+FROM php:8.3-apache
+
+# packages
+RUN sed -i 's|main|main non-free|' /etc/apt/sources.list.d/debian.sources && apt-get update && apt-get install -y \
+    unixodbc \
+    unixodbc-dev \
+    freetds-bin \
+    freetds-dev \
+    libicu-dev \
+    git \
+    unzip \
+    libzip-dev \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    libjpeg-dev \
+    libpng-dev \
+    libfreetype6-dev \ 
+    curl
+
+# cleanup
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# php libs
+RUN docker-php-ext-install \
+    intl \
+    pdo_mysql \
+    soap \
+    zip \
+    mbstring \
+    bcmath \
+    pdo_dblib
+
+# gd
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg && \
+    docker-php-ext-install gd
+
+# php memory
+ENV PHP_MEMORY_LIMIT=512M
+ENV PHP_UPLOAD_LIMIT=512M
+RUN { \
+        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
+        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
+        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+    } > "${PHP_INI_DIR}/conf.d/upload.ini"
+
+# apache
+RUN a2enmod rewrite
+RUN sed -i 's|/var/www/html|/var/www/html/public|' /etc/apache2/sites-available/000-default.conf
+RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+
+# composer
+USER www-data
+COPY --chown=www-data . .
+RUN composer install --optimize-autoloader --no-interaction
+
+CMD ["./serve.sh"]

composer.json

@@ -21,15 +21,15 @@
         "uspdev/laravel-tools": "^1.4",
         "uspdev/laravel-usp-theme": "^2.8.1",
         "uspdev/replicado": "^1.6",
-        "uspdev/senhaunica-socialite": "^4.3"
+        "uspdev/senhaunica-socialite": "^4.5"
     },
     "require-dev": {
-        "spatie/laravel-ignition": "^2.4",
         "fakerphp/faker": "^1.9.1",
-        "laravel/dusk": "^8.0",
+        "laravel/dusk": "^8.6",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.0"
+        "phpunit/phpunit": "^11.0",
+        "spatie/laravel-ignition": "^2.4"
     },
     "config": {
         "optimize-autoloader": true,
@@ -62,8 +62,7 @@
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi",
-            "@php artisan vendor:publish --provider=\"Uspdev\\UspTheme\\ServiceProvider\" --tag=assets --force",
-            "@php artisan dusk:chrome-driver --detect"
+            "@php artisan vendor:publish --provider=\"Uspdev\\UspTheme\\ServiceProvider\" --tag=assets --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""