Skip to content

Commit

Permalink
Merge branch 'master' of github.com:a-h-abid/docker-commons
Browse files Browse the repository at this point in the history
  • Loading branch information
a-h-abid committed Dec 2, 2024
2 parents b4e2d0a + b627602 commit 2ee5067
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
COMPOSE_CONVERT_WINDOWS_PATHS=1

# Select which docker-compose files to include. Append more with `:docker-compose.prod.yml` at the end
COMPOSE_FILE=docker-compose.yml:docker-compose.override.adminer.yml:docker-compose.override.cassandra.yml:docker-compose.override.mysql.yml:docker-compose.override.redis.yml:redis-insight/compose.redis-insight.yml:docker-compose.override.minio.yml:docker-compose.override.rabbitmq.yml:docker-compose.override.elasticsearch.yml:docker-compose.override.maildev.yml:docker-compose.override.mailhog.yml:docker-compose.override.traefik.yml:docker-compose.override.grafana.yml:docker-compose.override.redisearch.yml:docker-compose.override.redis-stack.yml:docker-compose.override.cassandra-dse.yml:docker-compose.override.apache-zookeeper.yml:docker-compose.override.postgres.yml:docker-compose.override.fluentd.yml:docker-compose.override.apache-druid.yml:docker-compose.override.jenkins.yml:docker-compose.override.mongo.yml:docker-compose.override.flagr.yml:docker-compose.override.yml
COMPOSE_FILE=docker-compose.yml:docker-compose.override.adminer.yml:docker-compose.override.cassandra.yml:docker-compose.override.mysql.yml:docker-compose.override.redis.yml:redis-insight/compose.redis-insight.yml:docker-compose.override.minio.yml:docker-compose.override.rabbitmq.yml:docker-compose.override.elasticsearch.yml:docker-compose.override.maildev.yml:docker-compose.override.mailhog.yml:docker-compose.override.traefik.yml:docker-compose.override.grafana.yml:docker-compose.override.redisearch.yml:docker-compose.override.redis-stack.yml:docker-compose.override.cassandra-dse.yml:docker-compose.override.apache-zookeeper.yml:docker-compose.override.postgres.yml:docker-compose.override.fluentd.yml:docker-compose.override.apache-druid.yml:docker-compose.override.jenkins.yml:docker-compose.override.mongo.yml:docker-compose.override.flagr.yml:docker-compose.override.dragonfly.yml:docker-compose.override.yml

# Change the separator from : to ; on Windows
COMPOSE_PATH_SEPARATOR=:
Expand Down Expand Up @@ -90,6 +90,7 @@ JENKINS_PUBLISH_PORT=8443
MONGO_PUBLISH_PORT=27019
SFTP_PUBLISH_PORT=8422
FLAGR_PUBLISH_PORT=28000
DRAGONFLY_PUBLISH_PORT=36379

# =============================================================

Expand Down
4 changes: 4 additions & 0 deletions .envs/dragonfly.example.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Use DFLY as prefix for any command as envoronment variable
# Reference: https://github.com/dragonflydb/dragonfly/discussions/2089
# Commands: https://www.dragonflydb.io/docs/managing-dragonfly/flags
DFLY_requirepass=dragonflypass
4 changes: 4 additions & 0 deletions adminer/compose.adminer.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ services:
image: 'adminer:${ADMINER_IMAGE_TAG:-4.8.1}'
env_file:
- .env
deploy:
resources:
limits:
memory: 256MB
networks:
- common-net
ports:
Expand Down
19 changes: 19 additions & 0 deletions docker-compose.override.dragonfly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Official doc: https://www.dragonflydb.io/docs/getting-started/docker-compose
volumes:
common-dragonfly-db:
name: 'common-dragonfly-db'

services:

dragonfly:
image: 'docker.dragonflydb.io/dragonflydb/dragonfly'
env_file:
- .envs/dragonfly.env
ulimits:
memlock: -1
volumes:
- common-dragonfly-db:/data
networks:
common-net:
aliases:
- common-dragonfly
6 changes: 6 additions & 0 deletions docker-compose.override.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,9 @@ services:
- ${FLAGR_PUBLISH_PORT}:18000
volumes:
- ./flagr/flagr_db:/data/db

dragonfly:
ports:
- ${DRAGONFLY_PUBLISH_PORT}:6379
volumes:
- common-dragonfly-db:/data
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Name | In Compose | Require Image Build | Network Alias
Adminer | adminer | |
Blackfire | blackfire | | common-blackfire
Cassandra | cassandra | | common-cassandra
Dragonflydb | dragonfly | | common-dragonfly
ElasticSearch | elasticsearch | Yes | common-elasticsearch
Flagr | flagr | Yes | common-flagr
Grafana | grafana | |
Expand Down

0 comments on commit 2ee5067

Please sign in to comment.