Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions services/redis-commander/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
config.json
docker-compose.yml
11 changes: 7 additions & 4 deletions services/redis-commander/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ REPO_BASE_DIR := $(shell git rev-parse --show-toplevel)
include ${REPO_BASE_DIR}/scripts/common.Makefile

.PHONY: up ## Deploys redis stack
up: .init .env ${TEMP_COMPOSE}
up: .init ${TEMP_COMPOSE} prune-docker-stack-configs
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}

.PHONY: up-letsencrypt-http ## Deploys redis stack using let's encrypt http challenge
up-letsencrypt-http: .init .env ${TEMP_COMPOSE}-letsencrypt-http
up-letsencrypt-http: .init ${TEMP_COMPOSE}-letsencrypt-http
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-http ${STACK_NAME}

.PHONY: up-letsencrypt-dns ## Deploys redis stack using let's encrypt dns challenge
up-letsencrypt-dns: .init .env ${TEMP_COMPOSE}-letsencrypt-dns
up-letsencrypt-dns: .init ${TEMP_COMPOSE}-letsencrypt-dns
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-dns ${STACK_NAME}

.PHONY: up-dalco ## Deploys redis-commander stack for Dalco Cluster
Expand All @@ -36,7 +36,10 @@ up-local: up
.PHONY: up-aws ## Deploys redis-commander stack in aws
up-aws: up

docker-compose.yml: config.json
docker-compose.yml: .env config.json
@$(call jinja, docker-compose.yml.j2, .env, docker-compose.yml.unlinted) && \
$(_yq) docker-compose.yml.unlinted > docker-compose.yml; \
rm docker-compose.yml.unlinted >/dev/null 2>&1;

.PHONY: ${TEMP_COMPOSE}
${TEMP_COMPOSE}: docker-compose.yml .env
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ services:
environment:
- URL_PREFIX=/redis
deploy:
update_config:
order: start-first
delay: 10s
failure_action: rollback
parallelism: 1
placement:
constraints:
- node.labels.ops == true
Expand All @@ -37,6 +42,7 @@ services:
configs:
redis_commander_config:
file: ./config.json
name: ${STACK_NAME}_config_{{ "./config.json" | sha256file | substring(0,10) }}

networks:
public:
Expand Down
2 changes: 2 additions & 0 deletions services/redis-commander/template.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
STACK_NAME=${STACK_NAME}

MONITORING_DOMAIN=${MONITORING_DOMAIN}
PREFIX_STACK_NAME=${PREFIX_STACK_NAME}
REDIS_HOST=${REDIS_HOST}
Expand Down
Loading