Skip to content

Commit 031acd4

Browse files
committed
Add missing deps and remove stale files
1 parent 1542df5 commit 031acd4

File tree

3 files changed

+8
-36
lines changed

3 files changed

+8
-36
lines changed

services/monitoring/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,23 @@ docker-compose.master.yml: docker-compose.master.yml.j2 config.prometheus.ceph.s
9494

9595
TEMP_COMPOSE_COMMON_DEPENDENCIES := docker-compose.yml .env pgsql_query_exporter_config.yaml smokeping_prober_config.yaml tempo_config.yaml
9696

97-
${TEMP_COMPOSE}: config.prometheus $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
97+
${TEMP_COMPOSE}: docker-compose.yml config.prometheus $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
9898
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
9999

100-
${TEMP_COMPOSE}-dalco: docker-compose.dalco.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
100+
${TEMP_COMPOSE}-dalco: docker-compose.yml docker-compose.dalco.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
101101
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.dalco.yml > $@
102102

103-
${TEMP_COMPOSE}-public: docker-compose.public.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
103+
${TEMP_COMPOSE}-public: docker-compose.yml docker-compose.public.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
104104
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.public.yml > $@
105105

106-
${TEMP_COMPOSE}-aws: docker-compose.aws.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
106+
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
107107
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.aws.yml > $@
108108

109-
${TEMP_COMPOSE}-master: docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
109+
${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
110110
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.master.yml > $@
111111

112-
${TEMP_COMPOSE}-local: docker-compose.letsencrypt.dns.yml config.prometheus.simcore $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
113-
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@
112+
${TEMP_COMPOSE}-local: docker-compose.yml config.prometheus.simcore $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
113+
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
114114

115115
#
116116
# artifacts targets
@@ -146,7 +146,7 @@ config.prometheus.simcore.aws: ${REPO_CONFIG_LOCATION} .venv
146146
mv prometheus/prometheus.temp.yml prometheus/prometheus.yml
147147

148148
.PHONY: config.prometheus.ceph.simcore
149-
config.prometheus.ceph.simcore: ${REPO_CONFIG_LOCATION} .venv
149+
config.prometheus.ceph.simcore: ${REPO_CONFIG_LOCATION} .env .venv
150150
@set -o allexport; \
151151
source $<; \
152152
set +o allexport; \

services/monitoring/docker-compose.letsencrypt.dns.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

services/monitoring/docker-compose.letsencrypt.http.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)