From acbd3cea58b7d325772cbc83fcf8250ba42a509c Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Wed, 9 Feb 2022 13:06:27 -0600
Subject: [PATCH] Move docker-compose files to subdirectory

This makes the root a little cleaner

Fixes #221
---
 Makefile                                                      | 4 ++--
 .../docker-compose/docker-compose.activemq.yml                | 0
 .../docker-compose/docker-compose.alpaca.yml                  | 0
 .../docker-compose/docker-compose.blazegraph.yml              | 0
 .../docker-compose/docker-compose.cantaloupe.yml              | 0
 .../docker-compose/docker-compose.code-server.yml             | 0
 .../docker-compose/docker-compose.crayfish.yml                | 0
 .../docker-compose/docker-compose.crayfits.yml                | 0
 .../docker-compose/docker-compose.custom.yml                  | 0
 .../docker-compose/docker-compose.demo.yml                    | 0
 .../docker-compose/docker-compose.drupal.mariadb.yml          | 0
 .../docker-compose/docker-compose.drupal.postgresql.yml       | 0
 .../docker-compose/docker-compose.drupal.yml                  | 0
 .../docker-compose/docker-compose.etcd.yml                    | 0
 .../docker-compose/docker-compose.fcrepo.mariadb.yml          | 0
 .../docker-compose/docker-compose.fcrepo.postgresql.yml       | 0
 .../docker-compose/docker-compose.fcrepo.yml                  | 0
 .../docker-compose/docker-compose.fcrepo6.mariadb.yml         | 0
 .../docker-compose/docker-compose.fcrepo6.postgresql.yml      | 0
 .../docker-compose/docker-compose.fcrepo6.yml                 | 0
 .../docker-compose/docker-compose.local.yml                   | 0
 .../docker-compose/docker-compose.mariadb.yml                 | 0
 .../docker-compose/docker-compose.matomo.yml                  | 0
 .../docker-compose/docker-compose.postgresql.yml              | 0
 .../docker-compose/docker-compose.secrets.yml                 | 0
 .../docker-compose/docker-compose.solr.yml                    | 0
 .../docker-compose/docker-compose.traefik.yml                 | 0
 .../docker-compose/docker-compose.watchtower.yml              | 0
 28 files changed, 2 insertions(+), 2 deletions(-)
 rename docker-compose.activemq.yml => build/docker-compose/docker-compose.activemq.yml (100%)
 rename docker-compose.alpaca.yml => build/docker-compose/docker-compose.alpaca.yml (100%)
 rename docker-compose.blazegraph.yml => build/docker-compose/docker-compose.blazegraph.yml (100%)
 rename docker-compose.cantaloupe.yml => build/docker-compose/docker-compose.cantaloupe.yml (100%)
 rename docker-compose.code-server.yml => build/docker-compose/docker-compose.code-server.yml (100%)
 rename docker-compose.crayfish.yml => build/docker-compose/docker-compose.crayfish.yml (100%)
 rename docker-compose.crayfits.yml => build/docker-compose/docker-compose.crayfits.yml (100%)
 rename docker-compose.custom.yml => build/docker-compose/docker-compose.custom.yml (100%)
 rename docker-compose.demo.yml => build/docker-compose/docker-compose.demo.yml (100%)
 rename docker-compose.drupal.mariadb.yml => build/docker-compose/docker-compose.drupal.mariadb.yml (100%)
 rename docker-compose.drupal.postgresql.yml => build/docker-compose/docker-compose.drupal.postgresql.yml (100%)
 rename docker-compose.drupal.yml => build/docker-compose/docker-compose.drupal.yml (100%)
 rename docker-compose.etcd.yml => build/docker-compose/docker-compose.etcd.yml (100%)
 rename docker-compose.fcrepo.mariadb.yml => build/docker-compose/docker-compose.fcrepo.mariadb.yml (100%)
 rename docker-compose.fcrepo.postgresql.yml => build/docker-compose/docker-compose.fcrepo.postgresql.yml (100%)
 rename docker-compose.fcrepo.yml => build/docker-compose/docker-compose.fcrepo.yml (100%)
 rename docker-compose.fcrepo6.mariadb.yml => build/docker-compose/docker-compose.fcrepo6.mariadb.yml (100%)
 rename docker-compose.fcrepo6.postgresql.yml => build/docker-compose/docker-compose.fcrepo6.postgresql.yml (100%)
 rename docker-compose.fcrepo6.yml => build/docker-compose/docker-compose.fcrepo6.yml (100%)
 rename docker-compose.local.yml => build/docker-compose/docker-compose.local.yml (100%)
 rename docker-compose.mariadb.yml => build/docker-compose/docker-compose.mariadb.yml (100%)
 rename docker-compose.matomo.yml => build/docker-compose/docker-compose.matomo.yml (100%)
 rename docker-compose.postgresql.yml => build/docker-compose/docker-compose.postgresql.yml (100%)
 rename docker-compose.secrets.yml => build/docker-compose/docker-compose.secrets.yml (100%)
 rename docker-compose.solr.yml => build/docker-compose/docker-compose.solr.yml (100%)
 rename docker-compose.traefik.yml => build/docker-compose/docker-compose.traefik.yml (100%)
 rename docker-compose.watchtower.yml => build/docker-compose/docker-compose.watchtower.yml (100%)

diff --git a/Makefile b/Makefile
index 19ba641782..268d7e1a11 100644
--- a/Makefile
+++ b/Makefile
@@ -79,8 +79,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.
diff --git a/docker-compose.activemq.yml b/build/docker-compose/docker-compose.activemq.yml
similarity index 100%
rename from docker-compose.activemq.yml
rename to build/docker-compose/docker-compose.activemq.yml
diff --git a/docker-compose.alpaca.yml b/build/docker-compose/docker-compose.alpaca.yml
similarity index 100%
rename from docker-compose.alpaca.yml
rename to build/docker-compose/docker-compose.alpaca.yml
diff --git a/docker-compose.blazegraph.yml b/build/docker-compose/docker-compose.blazegraph.yml
similarity index 100%
rename from docker-compose.blazegraph.yml
rename to build/docker-compose/docker-compose.blazegraph.yml
diff --git a/docker-compose.cantaloupe.yml b/build/docker-compose/docker-compose.cantaloupe.yml
similarity index 100%
rename from docker-compose.cantaloupe.yml
rename to build/docker-compose/docker-compose.cantaloupe.yml
diff --git a/docker-compose.code-server.yml b/build/docker-compose/docker-compose.code-server.yml
similarity index 100%
rename from docker-compose.code-server.yml
rename to build/docker-compose/docker-compose.code-server.yml
diff --git a/docker-compose.crayfish.yml b/build/docker-compose/docker-compose.crayfish.yml
similarity index 100%
rename from docker-compose.crayfish.yml
rename to build/docker-compose/docker-compose.crayfish.yml
diff --git a/docker-compose.crayfits.yml b/build/docker-compose/docker-compose.crayfits.yml
similarity index 100%
rename from docker-compose.crayfits.yml
rename to build/docker-compose/docker-compose.crayfits.yml
diff --git a/docker-compose.custom.yml b/build/docker-compose/docker-compose.custom.yml
similarity index 100%
rename from docker-compose.custom.yml
rename to build/docker-compose/docker-compose.custom.yml
diff --git a/docker-compose.demo.yml b/build/docker-compose/docker-compose.demo.yml
similarity index 100%
rename from docker-compose.demo.yml
rename to build/docker-compose/docker-compose.demo.yml
diff --git a/docker-compose.drupal.mariadb.yml b/build/docker-compose/docker-compose.drupal.mariadb.yml
similarity index 100%
rename from docker-compose.drupal.mariadb.yml
rename to build/docker-compose/docker-compose.drupal.mariadb.yml
diff --git a/docker-compose.drupal.postgresql.yml b/build/docker-compose/docker-compose.drupal.postgresql.yml
similarity index 100%
rename from docker-compose.drupal.postgresql.yml
rename to build/docker-compose/docker-compose.drupal.postgresql.yml
diff --git a/docker-compose.drupal.yml b/build/docker-compose/docker-compose.drupal.yml
similarity index 100%
rename from docker-compose.drupal.yml
rename to build/docker-compose/docker-compose.drupal.yml
diff --git a/docker-compose.etcd.yml b/build/docker-compose/docker-compose.etcd.yml
similarity index 100%
rename from docker-compose.etcd.yml
rename to build/docker-compose/docker-compose.etcd.yml
diff --git a/docker-compose.fcrepo.mariadb.yml b/build/docker-compose/docker-compose.fcrepo.mariadb.yml
similarity index 100%
rename from docker-compose.fcrepo.mariadb.yml
rename to build/docker-compose/docker-compose.fcrepo.mariadb.yml
diff --git a/docker-compose.fcrepo.postgresql.yml b/build/docker-compose/docker-compose.fcrepo.postgresql.yml
similarity index 100%
rename from docker-compose.fcrepo.postgresql.yml
rename to build/docker-compose/docker-compose.fcrepo.postgresql.yml
diff --git a/docker-compose.fcrepo.yml b/build/docker-compose/docker-compose.fcrepo.yml
similarity index 100%
rename from docker-compose.fcrepo.yml
rename to build/docker-compose/docker-compose.fcrepo.yml
diff --git a/docker-compose.fcrepo6.mariadb.yml b/build/docker-compose/docker-compose.fcrepo6.mariadb.yml
similarity index 100%
rename from docker-compose.fcrepo6.mariadb.yml
rename to build/docker-compose/docker-compose.fcrepo6.mariadb.yml
diff --git a/docker-compose.fcrepo6.postgresql.yml b/build/docker-compose/docker-compose.fcrepo6.postgresql.yml
similarity index 100%
rename from docker-compose.fcrepo6.postgresql.yml
rename to build/docker-compose/docker-compose.fcrepo6.postgresql.yml
diff --git a/docker-compose.fcrepo6.yml b/build/docker-compose/docker-compose.fcrepo6.yml
similarity index 100%
rename from docker-compose.fcrepo6.yml
rename to build/docker-compose/docker-compose.fcrepo6.yml
diff --git a/docker-compose.local.yml b/build/docker-compose/docker-compose.local.yml
similarity index 100%
rename from docker-compose.local.yml
rename to build/docker-compose/docker-compose.local.yml
diff --git a/docker-compose.mariadb.yml b/build/docker-compose/docker-compose.mariadb.yml
similarity index 100%
rename from docker-compose.mariadb.yml
rename to build/docker-compose/docker-compose.mariadb.yml
diff --git a/docker-compose.matomo.yml b/build/docker-compose/docker-compose.matomo.yml
similarity index 100%
rename from docker-compose.matomo.yml
rename to build/docker-compose/docker-compose.matomo.yml
diff --git a/docker-compose.postgresql.yml b/build/docker-compose/docker-compose.postgresql.yml
similarity index 100%
rename from docker-compose.postgresql.yml
rename to build/docker-compose/docker-compose.postgresql.yml
diff --git a/docker-compose.secrets.yml b/build/docker-compose/docker-compose.secrets.yml
similarity index 100%
rename from docker-compose.secrets.yml
rename to build/docker-compose/docker-compose.secrets.yml
diff --git a/docker-compose.solr.yml b/build/docker-compose/docker-compose.solr.yml
similarity index 100%
rename from docker-compose.solr.yml
rename to build/docker-compose/docker-compose.solr.yml
diff --git a/docker-compose.traefik.yml b/build/docker-compose/docker-compose.traefik.yml
similarity index 100%
rename from docker-compose.traefik.yml
rename to build/docker-compose/docker-compose.traefik.yml
diff --git a/docker-compose.watchtower.yml b/build/docker-compose/docker-compose.watchtower.yml
similarity index 100%
rename from docker-compose.watchtower.yml
rename to build/docker-compose/docker-compose.watchtower.yml