created a Dockerfile for db and updated docker-compose.yml
This commit is contained in:
5
db/Dockerfile
Normal file
5
db/Dockerfile
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
FROM mariadb:11
|
||||||
|
|
||||||
|
# Optional: preload config
|
||||||
|
COPY conf.d /etc/mysql/conf.d/
|
||||||
|
COPY init /docker-entrypoint-initdb.d/
|
||||||
@@ -1,32 +1,21 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mariadb:11
|
image: simonclr/radmac-db:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
ports:
|
||||||
MYSQL_ROOT_PASSWORD: rootpassword
|
- "3306:3306"
|
||||||
MYSQL_DATABASE: radius
|
|
||||||
MYSQL_USER: radiususer
|
|
||||||
MYSQL_PASSWORD: radiuspass
|
|
||||||
volumes:
|
volumes:
|
||||||
- db_data:/var/lib/mysql
|
- db_data:/var/lib/mysql
|
||||||
- ./db/conf.d:/etc/mysql/conf.d
|
|
||||||
- ./db/init:/docker-entrypoint-initdb.d
|
|
||||||
ports:
|
|
||||||
- "3306:3306" # Exposed for dev access
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
||||||
start_period: 10s
|
start_period: 10s
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|
||||||
radius:
|
radius:
|
||||||
build:
|
image: simonclr/radmac-radius:latest
|
||||||
context: ./radius
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -35,23 +24,10 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "1812:1812/udp"
|
- "1812:1812/udp"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
adminer:
|
|
||||||
image: adminer
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "8081:8080"
|
|
||||||
app:
|
app:
|
||||||
build:
|
image: simonclr/radmac-app:latest
|
||||||
context: ./app
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
args:
|
|
||||||
TIMEZONE: ${APP_TIMEZONE}
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./app:/app
|
- ./app:/app # Optional: remove if not needed for production
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
@@ -63,14 +39,18 @@ services:
|
|||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
nginx:
|
nginx:
|
||||||
build:
|
image: simonclr/radmac-nginx:latest
|
||||||
context: ./nginx
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "8080:80"
|
- "8080:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
adminer:
|
||||||
|
image: adminer
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8081:8080"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
db_data:
|
db_data:
|
||||||
Reference in New Issue
Block a user