Filestash: rolling config update (#1018)

YuryHrytsuk · web-flow · commit 31c39e5e99a3 · 2025-04-15T09:51:56.000+02:00
Implement rolling config update for filestash. When content of config file is changed, docker service will be automatically updated without manual intervention needed. Related Issue(s): * #984
diff --git a/services/filestash/.gitignore b/services/filestash/.gitignore
@@ -1,2 +1,3 @@
 filestash_config.json
 venv/*
+docker-compose.yml
diff --git a/services/filestash/Makefile b/services/filestash/Makefile
@@ -41,6 +41,9 @@ up-local: up
 
 # Helpers -------------------------------------------------
 
+docker-compose.yml: docker-compose.yml.j2 .venv .env
+	@$(call jinja, $<, .env, $@)
+
 .PHONY: ${TEMP_COMPOSE}
 ${TEMP_COMPOSE}: docker-compose.yml .env
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
diff --git a/services/filestash/docker-compose.yml.j2 b/services/filestash/docker-compose.yml.j2
@@ -45,4 +45,5 @@ networks:
 
 configs:
   filestash_config:
+    name: ${STACK_NAME}_filestash_config_{{ "./filestash_config.json" | sha256file | substring(0,10) }}
     file: ./filestash_config.json
diff --git a/services/filestash/template.env b/services/filestash/template.env
@@ -1,3 +1,4 @@
+STACK_NAME=${STACK_NAME}
 S3_BUCKET_NAME=${S3_BUCKET}
 S3_ENDPOINT=${S3_ENDPOINT}
 S3_SECURE=${S3_SECURE}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`filestash_config.json`
`2`	`2`	`venv/*`
	`3`	`+docker-compose.yml`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+STACK_NAME=${STACK_NAME}`
`1`	`2`	`S3_BUCKET_NAME=${S3_BUCKET}`
`2`	`3`	`S3_ENDPOINT=${S3_ENDPOINT}`
`3`	`4`	`S3_SECURE=${S3_SECURE}`