Move docker-compose files to subdirectory

This makes the root a little cleaner Fixes Islandora-Devops#221
misilot · Feb 9, 2022 · 13dac2e · 13dac2e
1 parent 1696f96
commit 13dac2e
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 2 deletions.
diff --git 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 → ...ocker-compose/docker-compose.activemq.yml b/docker-compose.activemq.yml → ...ocker-compose/docker-compose.activemq.yml
diff --git a/docker-compose.alpaca.yml → .../docker-compose/docker-compose.alpaca.yml b/docker-compose.alpaca.yml → .../docker-compose/docker-compose.alpaca.yml
diff --git a/docker-compose.blazegraph.yml → ...ker-compose/docker-compose.blazegraph.yml b/docker-compose.blazegraph.yml → ...ker-compose/docker-compose.blazegraph.yml
diff --git a/docker-compose.cantaloupe.yml → ...ker-compose/docker-compose.cantaloupe.yml b/docker-compose.cantaloupe.yml → ...ker-compose/docker-compose.cantaloupe.yml
diff --git a/docker-compose.code-server.yml → ...er-compose/docker-compose.code-server.yml b/docker-compose.code-server.yml → ...er-compose/docker-compose.code-server.yml
diff --git a/docker-compose.crayfish.yml → ...ocker-compose/docker-compose.crayfish.yml b/docker-compose.crayfish.yml → ...ocker-compose/docker-compose.crayfish.yml
diff --git a/docker-compose.crayfits.yml → ...ocker-compose/docker-compose.crayfits.yml b/docker-compose.crayfits.yml → ...ocker-compose/docker-compose.crayfits.yml
diff --git a/docker-compose.custom.yml → .../docker-compose/docker-compose.custom.yml b/docker-compose.custom.yml → .../docker-compose/docker-compose.custom.yml
diff --git a/docker-compose.demo.yml → build/docker-compose/docker-compose.demo.yml b/docker-compose.demo.yml → build/docker-compose/docker-compose.demo.yml
diff --git a/docker-compose.drupal.mariadb.yml → ...compose/docker-compose.drupal.mariadb.yml b/docker-compose.drupal.mariadb.yml → ...compose/docker-compose.drupal.mariadb.yml
diff --git a/docker-compose.drupal.postgresql.yml → ...pose/docker-compose.drupal.postgresql.yml b/docker-compose.drupal.postgresql.yml → ...pose/docker-compose.drupal.postgresql.yml
diff --git a/docker-compose.drupal.yml → .../docker-compose/docker-compose.drupal.yml b/docker-compose.drupal.yml → .../docker-compose/docker-compose.drupal.yml
diff --git a/docker-compose.etcd.yml → build/docker-compose/docker-compose.etcd.yml b/docker-compose.etcd.yml → build/docker-compose/docker-compose.etcd.yml
diff --git a/docker-compose.fcrepo.mariadb.yml → ...compose/docker-compose.fcrepo.mariadb.yml b/docker-compose.fcrepo.mariadb.yml → ...compose/docker-compose.fcrepo.mariadb.yml
diff --git a/docker-compose.fcrepo.postgresql.yml → ...pose/docker-compose.fcrepo.postgresql.yml b/docker-compose.fcrepo.postgresql.yml → ...pose/docker-compose.fcrepo.postgresql.yml
diff --git a/docker-compose.fcrepo.yml → .../docker-compose/docker-compose.fcrepo.yml b/docker-compose.fcrepo.yml → .../docker-compose/docker-compose.fcrepo.yml
diff --git a/docker-compose.fcrepo6.mariadb.yml → ...ompose/docker-compose.fcrepo6.mariadb.yml b/docker-compose.fcrepo6.mariadb.yml → ...ompose/docker-compose.fcrepo6.mariadb.yml
diff --git a/docker-compose.fcrepo6.postgresql.yml → ...ose/docker-compose.fcrepo6.postgresql.yml b/docker-compose.fcrepo6.postgresql.yml → ...ose/docker-compose.fcrepo6.postgresql.yml
diff --git a/docker-compose.fcrepo6.yml → ...docker-compose/docker-compose.fcrepo6.yml b/docker-compose.fcrepo6.yml → ...docker-compose/docker-compose.fcrepo6.yml
diff --git a/docker-compose.local.yml → ...d/docker-compose/docker-compose.local.yml b/docker-compose.local.yml → ...d/docker-compose/docker-compose.local.yml
diff --git a/docker-compose.mariadb.yml → ...docker-compose/docker-compose.mariadb.yml b/docker-compose.mariadb.yml → ...docker-compose/docker-compose.mariadb.yml
diff --git a/docker-compose.matomo.yml → .../docker-compose/docker-compose.matomo.yml b/docker-compose.matomo.yml → .../docker-compose/docker-compose.matomo.yml
diff --git a/docker-compose.postgresql.yml → ...ker-compose/docker-compose.postgresql.yml b/docker-compose.postgresql.yml → ...ker-compose/docker-compose.postgresql.yml
diff --git a/docker-compose.secrets.yml → ...docker-compose/docker-compose.secrets.yml b/docker-compose.secrets.yml → ...docker-compose/docker-compose.secrets.yml
diff --git a/docker-compose.solr.yml → build/docker-compose/docker-compose.solr.yml b/docker-compose.solr.yml → build/docker-compose/docker-compose.solr.yml
diff --git a/docker-compose.traefik.yml → ...docker-compose/docker-compose.traefik.yml b/docker-compose.traefik.yml → ...docker-compose/docker-compose.traefik.yml
diff --git a/docker-compose.watchtower.yml → ...ker-compose/docker-compose.watchtower.yml b/docker-compose.watchtower.yml → ...ker-compose/docker-compose.watchtower.yml