Skip to content

Commit

Permalink
Remove conflicts in docker file
Browse files Browse the repository at this point in the history
  • Loading branch information
aashwin-rvvup committed May 17, 2024
1 parent a1a1631 commit 9ade086
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- MARIADB_USER=bn_magento
- MARIADB_DATABASE=bitnami_magento
volumes:
- 'data_mariadb:/bitnami/mariadb'
- 'rvvup_magento_data_mariadb:/bitnami/mariadb'
magento:
ports:
- '80:8080'
Expand Down Expand Up @@ -44,16 +44,12 @@ services:
elasticsearch:
image: docker.io/bitnami/elasticsearch:7
volumes:
- 'elasticsearch_data:/bitnami/elasticsearch/data'
- 'rvvup_magento_elasticsearch_data:/bitnami/elasticsearch/data'
mailpit:
image: docker.io/axllent/mailpit:v1.18
ports:
- '1025:1025'
- '8025:8025'

volumes:
data_mariadb:
driver: local
magento_data:
rvvup_magento_data_mariadb:
driver: local
elasticsearch_data:
rvvup_magento_elasticsearch_data:
driver: local

0 comments on commit 9ade086

Please sign in to comment.