From 22d08b4155b974ef6eaeaffa24144e9241e4a508 Mon Sep 17 00:00:00 2001
From: Cynthia Kiser <cnk@caltech.edu>
Date: Wed, 4 Sep 2024 15:59:40 -0700
Subject: [PATCH] Rename docker-compose.yml to compose.yaml

---
 .devcontainer/{docker-compose.yml => compose.yaml} | 0
 .devcontainer/devcontainer.json                    | 6 +++---
 .dockerignore                                      | 1 +
 README.md                                          | 2 +-
 docker-compose.linux.yml => compose.linux.yaml     | 0
 docker-compose.yml => compose.yaml                 | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename .devcontainer/{docker-compose.yml => compose.yaml} (100%)
 rename docker-compose.linux.yml => compose.linux.yaml (100%)
 rename docker-compose.yml => compose.yaml (100%)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/compose.yaml
similarity index 100%
rename from .devcontainer/docker-compose.yml
rename to .devcontainer/compose.yaml
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8c92314..af30d1b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,11 +1,11 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/docker-existing-docker-compose
-// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
+// If you want to run as a non-root user in the container, see .devcontainer/compose.yaml.
 {
     "name": "Existing Docker Compose (Extend)",
     "dockerComposeFile": [
-        "../docker-compose.yml",
-        "docker-compose.yml"
+        "../compose.yaml",
+        "compose.yaml"
     ],
     "service": "web",
     "workspaceFolder": "/code",
diff --git a/.dockerignore b/.dockerignore
index 4b67e1f..60f6755 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,7 @@
 **/node_modules
 **/Dockerfile
 **/docker-compose.yml
+**/compose.yaml
 **/Procfile
 **/Vagrantfile
 **/.devcontainer
diff --git a/README.md b/README.md
index 14ff21d..0dbbbc3 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ WARNINGS:
 If you're running this on Linux you might get into some privilege issues that can be solved using this command (tested on Ubuntu):
 
 ```sh
-CURRENT_UID=$(id -u):$(id -g) docker compose -f docker-compose.yml -f docker-compose.linux.yml up
+CURRENT_UID=$(id -u):$(id -g) docker compose -f compose.yaml -f compose.linux.yaml up
 ```
 
 Alternatively, if you're using VSCode and have the "Remote - Containers" extension, you can open the command palette and select "Remote Containers - Reopen in Container" to attach VSCode to the container. This allows for much deeper debugging.
diff --git a/docker-compose.linux.yml b/compose.linux.yaml
similarity index 100%
rename from docker-compose.linux.yml
rename to compose.linux.yaml
diff --git a/docker-compose.yml b/compose.yaml
similarity index 100%
rename from docker-compose.yml
rename to compose.yaml