From a4b86ecef38dbf26b19adbfa374cf0f26f3ed828 Mon Sep 17 00:00:00 2001
From: Ashley Weaver <134093673+ashley-weaver@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:47:52 -0400
Subject: [PATCH] Update Docker commands (#126)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 🎫 Ticket

https://jira.cms.gov/browse/...

## 🛠 Changes

<!-- What was added, updated, or removed in this PR? -->

## ℹ️ Context

<!-- Why were these changes made? Add background context suitable for a
non-technical audience. -->

<!-- If any of the following security implications apply, this PR must
not be merged without Stephen Walter's approval. Explain in this section
and add @SJWalter11 as a reviewer.
  - Adds a new software dependency or dependencies.
  - Modifies or invalidates one or more of our security controls.
  - Stores or transmits data that was not stored or transmitted before.
- Requires additional review of security implications for other reasons.
-->

## 🧪 Validation

<!-- How were the changes verified? Did you fully test the acceptance
criteria in the ticket? Provide reproducible testing instructions and
screenshots if applicable. -->
---
 .lycheeignore             | 1 +
 Makefile                  | 6 +++---
 scripts/build_and_test.sh | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.lycheeignore b/.lycheeignore
index 6df36696..5fa61b19 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -15,3 +15,4 @@ https://dpc.cms.gov/api/v1*
 https://dpc.cms.gov/users/password/edit
 https://dpc.cms.gov/users/confirmation
 https://pacs.hospital.org/*
+https://www.medicaid.gov/
diff --git a/Makefile b/Makefile
index f67dfc04..608f37a6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ ig/publish: ${IG_PUBLISHER}
 	@java -jar ${IG_PUBLISHER} -ig implementation_guide/ig.json
 
 build:
-	docker-compose -f docker-compose.yml build static_site
-	docker-compose -f docker-compose.yml run -f static_site
+	docker compose -f docker-compose.yml build static_site
+	docker compose -f docker-compose.yml run static_site
 
 serve:
-	@docker-compose run --publish 4001:4000 --rm --entrypoint "bundle exec jekyll serve -H 0.0.0.0" --volume "./:/dpc-site-static/" static_site
+	@docker compose run --publish 4001:4000 --rm --entrypoint "bundle exec jekyll serve -H 0.0.0.0" --volume "./:/dpc-site-static/" static_site
diff --git a/scripts/build_and_test.sh b/scripts/build_and_test.sh
index 8429b1b6..eeeb474f 100755
--- a/scripts/build_and_test.sh
+++ b/scripts/build_and_test.sh
@@ -4,16 +4,16 @@ set -eo pipefail
 
 docker_cleanup()
 {
-    docker-compose down
+    docker compose down
 }
 
 build() {
-    docker-compose -f docker-compose.yml build static_site
+    docker compose -f docker-compose.yml build static_site
 }
 
 test() {
     trap docker_cleanup EXIT
-    docker-compose run -u "$(id -u "${USER}")":"$(id -g "${USER}")" --publish 4000:4000 --rm --entrypoint "bundle exec jekyll serve -H 0.0.0.0" --name static_site -d static_site
+    docker compose run -u "$(id -u "${USER}")":"$(id -g "${USER}")" --publish 4000:4000 --rm --entrypoint "bundle exec jekyll serve -H 0.0.0.0" --name static_site -d static_site
     sleep 20
     docker logs static_site
     curl localhost:4000 | grep "Update: what we're working on" || { echo "ERROR: Updates page not found"; exit 1; }