Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update docker-compose to use project name #657

Closed
wants to merge 1 commit into from
Closed

feat: update docker-compose to use project name #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions docker/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ APP_REDIS_PORT=9001
REDIS_ENABLED=false
REDIS_HOST=redis
REDIS_PORT=6379

COMPOSE_PROJECT_NAME=hexabot
2 changes: 0 additions & 2 deletions docker/docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ services:
- 27017:27017

mongo-express:
container_name: mongoUi
image: mongo-express:1-20
restart: always
ports:
Expand All @@ -32,7 +31,6 @@ services:
ME_CONFIG_MONGODB_URL: ${MONGO_URI}

hexabot-frontend:
container_name: frontend
build:
context: ../
dockerfile: ./frontend/Dockerfile
Expand Down
9 changes: 4 additions & 5 deletions docker/docker-compose.nginx.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: "3.8"

services:
nginx:
container_name: nginx
volumes:
- ./nginx/unsecure/:/etc/nginx/templates/
- /etc/localtime:/etc/localtime:ro
nginx:
volumes:
- ./nginx/unsecure/:/etc/nginx/templates/
- /etc/localtime:/etc/localtime:ro
3 changes: 1 addition & 2 deletions docker/docker-compose.nginx.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ version: "3.8"

services:
nginx:
container_name: nginx
volumes:
- ./nginx/secure/:/etc/nginx/templates/
- /etc/localtime:/etc/localtime:ro
- ./nginx/certbot/conf:/etc/letsencrypt
- ./nginx/certbot/www:/var/www/certbot
- ./nginx/99-autoreload.sh:/docker-entrypoint.d/99-autoreload.sh
- ./nginx/99-autoreload.sh:/docker-entrypoint.d/99-autoreload.sh

certbot:
image: certbot/certbot
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose.nginx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: "3.8"

services:
nginx:
container_name: nginx
image: nginx:latest
restart: unless-stopped
env_file: .env
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose.ollama.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ version: "3.9"
services:
ollama:
image: ollama/ollama
container_name: ollama
volumes:
- ollama:/root/.ollama
# deploy:
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose.redis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
condition: service_healthy

redis:
container_name: redis
image: redis/redis-stack-server:7.2.0-v6
networks:
- cache-network
Expand Down
1 change: 0 additions & 1 deletion docker/docker-compose.widget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: "3.9"

services:
widget:
container_name: widget
image: hexastack/hexabot-widget:latest
networks:
- app-network
Expand Down
3 changes: 0 additions & 3 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: "3.9"

services:
api:
container_name: api
image: hexastack/hexabot-api:latest
env_file: .env
ports:
Expand All @@ -23,7 +22,6 @@ services:
start_period: 10s

hexabot-frontend:
container_name: frontend
Comment on lines 24 to -26
Copy link
Contributor

@marrouchi marrouchi Jan 30, 2025 •
edited by medchedli
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will potentially break the nginx config, we need to rename "hexabot-frontend" to "frontend"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I keep the container names in that case?

image: hexastack/hexabot-ui:latest
env_file: .env
ports:
Expand All @@ -35,7 +33,6 @@ services:
condition: service_healthy

mongo:
container_name: mongo
image: mongo:7.0
restart: always
environment:
Expand Down
Loading