From b37f1788b2050c4baed7c74737a5f0ed881353b1 Mon Sep 17 00:00:00 2001 From: RatulSaqibKhan Date: Wed, 30 Oct 2024 00:23:07 +0600 Subject: [PATCH 1/4] feat: dragonfly db configuraion added --- .env.example | 7 ++++++- docker-compose.override.dragonfly.yml | 18 ++++++++++++++++++ docker-compose.override.example.yml | 6 ++++++ readme.md | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 docker-compose.override.dragonfly.yml diff --git a/.env.example b/.env.example index b0511be..1ebe5f2 100644 --- a/.env.example +++ b/.env.example @@ -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=: @@ -90,6 +90,7 @@ JENKINS_PUBLISH_PORT=8443 MONGO_PUBLISH_PORT=27019 SFTP_PUBLISH_PORT=8422 FLAGR_PUBLISH_PORT=28000 +DRAGONFLY_PUBLISH_PORT=36379 # ============================================================= @@ -104,3 +105,7 @@ SFTP_VOLUME_DATA_DIR=./sftp-data NAMED_VOLUME_TO_BACKUP=common-mysql-db NAMED_VOLUME_TO_RESTORE=common-mysql-db + +# ============================================================= + +DRAGONFLY_PASSWORD=dragonflypass diff --git a/docker-compose.override.dragonfly.yml b/docker-compose.override.dragonfly.yml new file mode 100644 index 0000000..dc2cbac --- /dev/null +++ b/docker-compose.override.dragonfly.yml @@ -0,0 +1,18 @@ +# 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' + ulimits: + memlock: -1 + command: ["--requirepass", "${DRAGONFLY_PASSWORD}"] + volumes: + - common-dragonfly-db:/data + networks: + common-net: + aliases: + - common-dragonfly diff --git a/docker-compose.override.example.yml b/docker-compose.override.example.yml index bb5a6be..bf2c4cc 100644 --- a/docker-compose.override.example.yml +++ b/docker-compose.override.example.yml @@ -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 diff --git a/readme.md b/readme.md index 4f6d7fa..d74ebe5 100644 --- a/readme.md +++ b/readme.md @@ -42,6 +42,7 @@ SFTP | sftp | | common-sftp Traefik | traefik | | traefik Volume Backup | volume-backup | | Volume Restore | volume-restore | | +Dragonflydb | dragonfly | | common-dragonfly **Note**: The following services will not work in Windows Host Machine. You will have to use it inside WSL2 Distribution. * NFS Server From b194ddd394c45db2828990f2516891a769cf1e7a Mon Sep 17 00:00:00 2001 From: RatulSaqibKhan Date: Wed, 30 Oct 2024 00:33:27 +0600 Subject: [PATCH 2/4] fix: readme file updated in lexicographic order for Dragonflydb --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index d74ebe5..e53a56e 100644 --- a/readme.md +++ b/readme.md @@ -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 | | @@ -42,7 +43,6 @@ SFTP | sftp | | common-sftp Traefik | traefik | | traefik Volume Backup | volume-backup | | Volume Restore | volume-restore | | -Dragonflydb | dragonfly | | common-dragonfly **Note**: The following services will not work in Windows Host Machine. You will have to use it inside WSL2 Distribution. * NFS Server From f58eda27ffb7bfa5b817debc51512059a7f197e1 Mon Sep 17 00:00:00 2001 From: RatulSaqibKhan Date: Tue, 5 Nov 2024 09:10:53 +0600 Subject: [PATCH 3/4] fix: dragonfly password removed from .env.example --- .env.example | 2 +- docker-compose.override.dragonfly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 1ebe5f2..599f6ff 100644 --- a/.env.example +++ b/.env.example @@ -108,4 +108,4 @@ NAMED_VOLUME_TO_RESTORE=common-mysql-db # ============================================================= -DRAGONFLY_PASSWORD=dragonflypass +DRAGONFLY_PASSWORD= diff --git a/docker-compose.override.dragonfly.yml b/docker-compose.override.dragonfly.yml index dc2cbac..632cd86 100644 --- a/docker-compose.override.dragonfly.yml +++ b/docker-compose.override.dragonfly.yml @@ -9,7 +9,7 @@ services: image: 'docker.dragonflydb.io/dragonflydb/dragonfly' ulimits: memlock: -1 - command: ["--requirepass", "${DRAGONFLY_PASSWORD}"] + command: ["--requirepass", "${DRAGONFLY_PASSWORD:dragonflypass}"] volumes: - common-dragonfly-db:/data networks: From f6b131acc1b470ea06497444c2388359f6778d41 Mon Sep 17 00:00:00 2001 From: RatulSaqibKhan Date: Sun, 17 Nov 2024 22:26:01 +0600 Subject: [PATCH 4/4] fix: use dragonfly.env for dragonfly specific environment --- .env.example | 4 ---- .envs/dragonfly.example.env | 4 ++++ docker-compose.override.dragonfly.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .envs/dragonfly.example.env diff --git a/.env.example b/.env.example index 599f6ff..1e82048 100644 --- a/.env.example +++ b/.env.example @@ -105,7 +105,3 @@ SFTP_VOLUME_DATA_DIR=./sftp-data NAMED_VOLUME_TO_BACKUP=common-mysql-db NAMED_VOLUME_TO_RESTORE=common-mysql-db - -# ============================================================= - -DRAGONFLY_PASSWORD= diff --git a/.envs/dragonfly.example.env b/.envs/dragonfly.example.env new file mode 100644 index 0000000..b04d199 --- /dev/null +++ b/.envs/dragonfly.example.env @@ -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 \ No newline at end of file diff --git a/docker-compose.override.dragonfly.yml b/docker-compose.override.dragonfly.yml index 632cd86..96d9fbe 100644 --- a/docker-compose.override.dragonfly.yml +++ b/docker-compose.override.dragonfly.yml @@ -7,9 +7,10 @@ services: dragonfly: image: 'docker.dragonflydb.io/dragonflydb/dragonfly' + env_file: + - .envs/dragonfly.env ulimits: memlock: -1 - command: ["--requirepass", "${DRAGONFLY_PASSWORD:dragonflypass}"] volumes: - common-dragonfly-db:/data networks: