Skip to content
Snippets Groups Projects
Verified Commit fd4e3ed9 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

feat: update Docker configuration and entrypoint script

- Removed obsolete Apache virtual host configuration from `000-default.conf`.
- Updated `docker-compose.yml` to use a custom entrypoint script.
- Refactored `entrypoint.sh` to streamline dependency installation and start the Octane server.
- Changed the application name in `package-lock.json` from "rann-graphic-design-website" to "app".
parent d44a3db6
Branches
No related tags found
1 merge request!58Resolve "Ajouter pages visitées pour les 24 dernières heures"
......@@ -4,7 +4,7 @@ services:
context: .
image: registry.gitlab.sl-projects.com/sofianelasri/rann-graphic-design-website:latest
working_dir: /app
entrypoint: composer install && php artisan octane:frankenphp --workers=1 --max-requests=1
entrypoint: ["docker-init/entrypoint.sh"]
ports:
- '80:8000'
- '5173:5173'
......
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/public
<Directory /var/www/public>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>
#!/bin/bash
# If var/wwww/composer.json exists...
if [ ! -f /var/www/composer.json ]; then
echo "Probably a Gitlab CI environment, skipping..."
exec "$@"
else
cd /var/www || exit
echo "Installing dependencies..."
composer install
php artisan key:generate
......@@ -14,9 +7,5 @@ else
npm install
npm run build
echo "Starting services..."
service apache2 start
echo "All good!"
exec "$@"
fi
echo "Running Octane..."
php artisan octane:frankenphp --workers=1 --max-requests=1
\ No newline at end of file
{
"name": "rann-graphic-design-website",
"name": "app",
"lockfileVersion": 3,
"requires": true,
"packages": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment