Move docker-compose files to subdirectory

Fixes Islandora-Devops#221

 - Update context to the new locations in docker-compose.*.yml files
 - Move tls.yml to `build` directory and rename file to traefik-tls.yml.
   Since this file is in SCM, it isn't expected to be modified.

Makefile

@@ -89,8 +89,8 @@ SERVICES := $(REQUIRED_SERVICES) $(FCREPO_SERVICE) $(WATCHTOWER_SERVICE) $(ETCD_
 default: download-default-certs docker-compose.yml pull
 
 .SILENT: docker-compose.yml
-docker-compose.yml: $(SERVICES:%=docker-compose.%.yml) .env
-	docker-compose $(SERVICES:%=-f docker-compose.%.yml) config > docker-compose.yml
+docker-compose.yml: $(SERVICES:%=build/docker-compose/docker-compose.%.yml) .env
+	docker-compose $(SERVICES:%=-f build/docker-compose/docker-compose.%.yml) config > docker-compose.yml
 
 .PHONY: pull
 ## Fetches the latest images from the registry.

docker-compose.acme.yml → build/docker-compose/docker-compose.acme.yml

@@ -29,7 +29,7 @@ services:
       - --certificatesresolvers.myresolver.acme.storage=/acme/acme.json
       - --certificatesResolvers.myresolver.acme.caServer=${ACME_SERVER-https://acme-v02.api.letsencrypt.org/directory}
     volumes:
-      - ./acme:/acme:rw
+      - ../../acme:/acme:rw
   cantaloupe:
     labels:
       - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-cantaloupe_https.tls.certresolver=myresolver

docker-compose.code-server.yml → build/docker-compose/docker-compose.code-server.yml

@@ -10,7 +10,7 @@ networks:
     external: true
 secrets:
   CODE_SERVER_PASSWORD:
-    file: "./secrets/live/CODE_SERVER_PASSWORD"
+    file: "../../secrets/live/CODE_SERVER_PASSWORD"
 services:
   code-server:
     environment:

docker-compose.custom.yml → build/docker-compose/docker-compose.custom.yml

@@ -12,7 +12,7 @@ services:
   # The service name is drupal that is the default host name used by micro-services etc.
   drupal:
     build:
-      context: ./
+      context: ../../
       dockerfile: ${PROJECT_DRUPAL_DOCKERFILE:-./Dockerfile}
     environment:
       #

docker-compose.local.yml → build/docker-compose/docker-compose.local.yml

@@ -18,7 +18,7 @@ services:
     restart: ${RESTART_POLICY:-unless-stopped}
     image: ${REPOSITORY:-islandora}/drupal:${TAG:-latest}
     volumes:
-      - ./codebase:/var/www/drupal:delegated
+      - ../../codebase:/var/www/drupal:delegated
       - drupal-sites-data:/var/www/drupal/web/sites/default/files
       - solr-data:/opt/solr/server/solr
     environment:

docker-compose.secrets.yml → build/docker-compose/docker-compose.secrets.yml

@@ -1,37 +1,37 @@
 version: "3.7"
 secrets:
   ACTIVEMQ_PASSWORD:
-    file: "./secrets/live/ACTIVEMQ_PASSWORD"
+    file: "../../secrets/live/ACTIVEMQ_PASSWORD"
   ACTIVEMQ_WEB_ADMIN_PASSWORD:
-    file: "./secrets/live/ACTIVEMQ_WEB_ADMIN_PASSWORD"
+    file: "../../secrets/live/ACTIVEMQ_WEB_ADMIN_PASSWORD"
   ALPACA_ACTIVEMQ_PASSWORD:
-    file: "./secrets/live/ALPACA_ACTIVEMQ_PASSWORD"
+    file: "../../secrets/live/ALPACA_ACTIVEMQ_PASSWORD"
   ALPACA_KARAF_ADMIN_PASSWORD:
-    file: "./secrets/live/ALPACA_KARAF_ADMIN_PASSWORD"
+    file: "../../secrets/live/ALPACA_KARAF_ADMIN_PASSWORD"
   DB_ROOT_PASSWORD:
-    file: "./secrets/live/DB_ROOT_PASSWORD"
+    file: "../../secrets/live/DB_ROOT_PASSWORD"
   DRUPAL_DEFAULT_ACCOUNT_PASSWORD:
-    file: "./secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD"
+    file: "../../secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD"
   DRUPAL_DEFAULT_CONFIGDIR:
-    file: "./secrets/live/DRUPAL_DEFAULT_CONFIGDIR"
+    file: "../../secrets/live/DRUPAL_DEFAULT_CONFIGDIR"
   DRUPAL_DEFAULT_DB_PASSWORD:
-    file: "./secrets/live/DRUPAL_DEFAULT_DB_PASSWORD"
+    file: "../../secrets/live/DRUPAL_DEFAULT_DB_PASSWORD"
   DRUPAL_DEFAULT_SALT:
-    file: "./secrets/live/DRUPAL_DEFAULT_SALT"
+    file: "../../secrets/live/DRUPAL_DEFAULT_SALT"
   FCREPO_DB_PASSWORD:
-    file: "./secrets/live/FCREPO_DB_PASSWORD"
+    file: "../../secrets/live/FCREPO_DB_PASSWORD"
   JWT_ADMIN_TOKEN:
-    file: "./secrets/live/JWT_ADMIN_TOKEN"
+    file: "../../secrets/live/JWT_ADMIN_TOKEN"
   JWT_PUBLIC_KEY:
-    file: "./secrets/live/JWT_PUBLIC_KEY"
+    file: "../../secrets/live/JWT_PUBLIC_KEY"
   JWT_PRIVATE_KEY:
-    file: "./secrets/live/JWT_PRIVATE_KEY"
+    file: "../../secrets/live/JWT_PRIVATE_KEY"
   MATOMO_DB_PASSWORD:
-    file: "./secrets/live/MATOMO_DB_PASSWORD"
+    file: "../../secrets/live/MATOMO_DB_PASSWORD"
   MATOMO_USER_PASS:
-    file: "./secrets/live/MATOMO_USER_PASS"
+    file: "../../secrets/live/MATOMO_USER_PASS"
   TOMCAT_ADMIN_PASSWORD:
-    file: "./secrets/live/TOMCAT_ADMIN_PASSWORD"
+    file: "../../secrets/live/TOMCAT_ADMIN_PASSWORD"
 services:
   activemq:
     secrets:

docker-compose.traefik.yml → build/docker-compose/docker-compose.traefik.yml

@@ -53,8 +53,8 @@ services:
       - ${CODE_SERVER_PORT:-8443}:8443   # code-server
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ./tls.yml:/etc/traefik/tls.yml
-      - ./certs:/etc/ssl/traefik
+      - ../../build/traefik-tls.yml:/etc/traefik/tls.yml
+      - ../../certs:/etc/ssl/traefik
     labels:
       # Do not expose in production.
       - traefik.http.routers.api.service=api@internal