Compare commits

..

No commits in common. "ae5294ce1db1dc7e9551c3fb032ec2cace74cf48" and "e07a9874cfd535c17bcf6a035bbdb0f9a5cb99f1" have entirely different histories.

6 changed files with 7 additions and 242 deletions

3
.gitignore vendored
View File

@ -1,4 +1,3 @@
.env
src/.env src/.env
src/.env.local src/.env.local
src/.env.development src/.env.development
@ -14,3 +13,5 @@ src/storage/framework/views/
src/bootstrap/cache/ src/bootstrap/cache/
db_data/ db_data/
*.log *.log
.env
src/.env

View File

@ -5,7 +5,7 @@ services:
image: mariadb:11 image: mariadb:11
container_name: nexxo_db container_name: nexxo_db
restart: unless-stopped restart: unless-stopped
env_file: src/.env.development env_file: .env
environment: environment:
MARIADB_DATABASE: ${DB_DATABASE} MARIADB_DATABASE: ${DB_DATABASE}
MARIADB_USER: ${DB_USERNAME} MARIADB_USER: ${DB_USERNAME}

View File

@ -1,168 +0,0 @@
services:
db:
networks:
- nexxo
image: mariadb:11
container_name: nexxo_db
restart: unless-stopped
env_file: src/.env
environment:
MARIADB_DATABASE: ${DB_DATABASE}
MARIADB_USER: ${DB_USERNAME}
MARIADB_PASSWORD: ${DB_PASSWORD}
MARIADB_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
ports:
- "3306:3306"
volumes:
- ./db_data:/var/lib/mysql
healthcheck:
test: ["CMD-SHELL", "mariadb-admin ping -h localhost -u root -p$$MARIADB_ROOT_PASSWORD || exit 1"]
interval: 5s
timeout: 5s
retries: 20
start_period: 20s
app:
networks:
- nexxo
build:
context: .
dockerfile: docker/php/Dockerfile
args:
UID: 1000
GID: 1000
image: nexxo-php
container_name: nexxo_app
restart: unless-stopped
working_dir: /var/www/html
volumes:
- ./src:/var/www/html
env_file: src/.env
environment:
DB_HOST: db
REDIS_HOST: redis
XDG_CONFIG_HOME: /tmp
PSYSH_CONFIG_DIR: /tmp/psysh
depends_on:
db:
condition: service_healthy
web:
networks:
- nexxo
image: nginx:alpine
container_name: nexxo_web
restart: unless-stopped
ports:
- "80:80"
volumes:
- ./src:/var/www/html:ro
- ./docker/nginx/staging.conf:/etc/nginx/conf.d/default.conf:ro
depends_on:
- app
redis:
networks:
- nexxo
image: redis:7-alpine
container_name: nexxo_redis
restart: unless-stopped
ports:
- "127.0.0.1:6379:6379"
command: ["redis-server", "--appendonly", "yes"]
mail-worker:
networks:
- nexxo
image: nexxo-php
container_name: nexxo_mail_worker
restart: unless-stopped
env_file: src/.env
volumes:
- ./src:/var/www/html
working_dir: /var/www/html
command: php artisan app:process-mail-queue
depends_on:
db:
condition: service_healthy
worker:
networks:
- nexxo
image: nexxo-php
container_name: nexxo_worker
restart: unless-stopped
env_file: src/.env
volumes:
- ./src:/var/www/html
working_dir: /var/www/html
command: php artisan queue:work --sleep=1 --tries=3 --timeout=120
depends_on:
db:
condition: service_healthy
redis:
condition: service_started
scheduler:
image: nexxo-php
container_name: nexxo_scheduler
restart: unless-stopped
networks:
- nexxo
volumes:
- ./src:/var/www/html
env_file: src/.env
environment:
DB_HOST: db
REDIS_HOST: redis
command: >
sh -c '
until nc -z db 3306; do sleep 1; done;
php artisan schedule:work
'
depends_on:
- db
reverb:
networks:
- nexxo
image: nexxo-php
container_name: nexxo_reverb
command: php artisan reverb:start --host=0.0.0.0 --port=8080
env_file: src/.env
ports:
- "8080:8080"
restart: unless-stopped
volumes:
- ./src:/var/www/html
depends_on:
- redis
ntfy:
image: binwiederhier/ntfy
container_name: nexxo_ntfy
restart: unless-stopped
ports:
- "8082:80"
volumes:
- ./docker/ntfy/cache:/var/cache/ntfy
- ./docker/ntfy/config:/etc/ntfy
command:
- serve
horizon:
networks:
- nexxo
image: nexxo-php
container_name: nexxo_horizon
command: php artisan horizon
env_file: src/.env
volumes:
- ./src:/var/www/html
depends_on:
- redis
networks:
nexxo:
driver: bridge

View File

@ -5,7 +5,7 @@ services:
image: mariadb:11 image: mariadb:11
container_name: nexxo_db container_name: nexxo_db
restart: unless-stopped restart: unless-stopped
env_file: src/.env env_file: .env
environment: environment:
MARIADB_DATABASE: ${DB_DATABASE} MARIADB_DATABASE: ${DB_DATABASE}
MARIADB_USER: ${DB_USERNAME} MARIADB_USER: ${DB_USERNAME}
@ -39,7 +39,6 @@ services:
working_dir: /var/www/html working_dir: /var/www/html
volumes: volumes:
- ./src:/var/www/html - ./src:/var/www/html
env_file: src/.env
environment: environment:
DB_HOST: db DB_HOST: db
REDIS_HOST: redis REDIS_HOST: redis
@ -79,7 +78,7 @@ services:
image: nexxo-php image: nexxo-php
container_name: nexxo_mail_worker container_name: nexxo_mail_worker
restart: unless-stopped restart: unless-stopped
env_file: src/.env env_file: .env # 🔥 DAS HIER
volumes: volumes:
- ./src:/var/www/html - ./src:/var/www/html
working_dir: /var/www/html working_dir: /var/www/html
@ -94,7 +93,7 @@ services:
image: nexxo-php image: nexxo-php
container_name: nexxo_worker container_name: nexxo_worker
restart: unless-stopped restart: unless-stopped
env_file: src/.env env_file: .env # 🔥 auch hier
volumes: volumes:
- ./src:/var/www/html - ./src:/var/www/html
working_dir: /var/www/html working_dir: /var/www/html
@ -113,7 +112,6 @@ services:
- nexxo - nexxo
volumes: volumes:
- ./src:/var/www/html - ./src:/var/www/html
env_file: src/.env
environment: environment:
DB_HOST: db DB_HOST: db
REDIS_HOST: redis REDIS_HOST: redis
@ -131,7 +129,6 @@ services:
image: nexxo-php image: nexxo-php
container_name: nexxo_reverb container_name: nexxo_reverb
command: php artisan reverb:start --host=0.0.0.0 --port=8080 command: php artisan reverb:start --host=0.0.0.0 --port=8080
env_file: src/.env
ports: ports:
- "8080:8080" - "8080:8080"
restart: unless-stopped restart: unless-stopped
@ -159,7 +156,6 @@ services:
image: nexxo-php image: nexxo-php
container_name: nexxo_horizon container_name: nexxo_horizon
command: php artisan horizon command: php artisan horizon
env_file: src/.env
volumes: volumes:
- ./src:/var/www/html - ./src:/var/www/html
depends_on: depends_on:

View File

@ -1,59 +0,0 @@
server {
listen 80;
server_name app.staging.aziros.com
api.staging.aziros.com
connect.staging.aziros.com
www.staging.aziros.com
socket.staging.aziros.com
10.10.90.103;
root /var/www/html/public;
index index.php index.html;
client_max_body_size 20M;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
# Hauptrouting (Laravel)
location / {
try_files $uri $uri/ /index.php?$query_string;
}
location ^~ /livewire {
try_files $uri $uri/ /index.php?$query_string;
}
# PHP Handling
location ~ \.php$ {
try_files $uri =404;
fastcgi_pass app:9000;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param HTTPS on;
fastcgi_param HTTP_X_FORWARDED_PROTO https;
}
# Security
location ~ /\.ht {
deny all;
}
# Optional: favicon / robots
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
}
# Default Block (alles andere droppen)
server {
listen 80 default_server;
server_name _;
return 444;
}

View File

@ -34,11 +34,6 @@ DB_PORT=3306
DB_DATABASE=nexxo DB_DATABASE=nexxo
DB_USERNAME=nexxo DB_USERNAME=nexxo
DB_PASSWORD= DB_PASSWORD=
DB_ROOT_PASSWORD=
MARIADB_DATABASE=nexxo
MARIADB_USER=nexxo
MARIADB_PASSWORD=
MARIADB_ROOT_PASSWORD=
SESSION_DRIVER=redis SESSION_DRIVER=redis
SESSION_LIFETIME=120 SESSION_LIFETIME=120