Quick: Fix docker compose environment config for robots.txt path (#55)

* fix docker compose environment config for robots.txt path * use override instead of env variable to set robots.txt mount
TACC · Dec 11, 2024 · db6c69b · db6c69b
1 parent 6f5dab0
commit db6c69b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -24,13 +24,7 @@ else
 override COMPOSE =
 endif
 
-ifdef ROBOTS_TXT
-override ROBOTS_TXT_PATH = ${CAMINO_HOME}/conf/camino/${ROBOTS_TXT}
-else
-override ROBOTS_TXT_PATH = ${CAMINO_HOME}/conf/nginx/robots.txt.default
-endif
-
-DOCKER_COMPOSE :=  ${COMPOSE_COMMAND} ${BASE_COMPOSE} ${COMPOSE} --env-file=$(ENV_FILE)
+DOCKER_COMPOSE := ${COMPOSE_COMMAND} ${BASE_COMPOSE} ${COMPOSE} --env-file=$(ENV_FILE)
 
 .PHONY: deploy-docs
 deploy-docs:

diff --git a/conf/compose/docker-compose.nginx.yml b/conf/compose/docker-compose.nginx.yml
@@ -5,7 +5,7 @@ services:
     volumes:
       - ${CAMINO_HOME}/conf/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ${CAMINO_HOME}/conf/nginx/templates/default.conf.template:/etc/nginx/templates/default.conf.template
-      - ${ROBOTS_TXT_PATH}:/var/www/robots.txt:ro
+      - ${CAMINO_HOME}/conf/nginx/robots.txt.default:/var/www/robots.txt:ro
       - /etc/ssl/dhparam.pem:/etc/ssl/dhparam.pem:ro
     ports:
       - 80:80