From e47d7a32aae2c5a4e44ddb69e0ac20e3f50d505d Mon Sep 17 00:00:00 2001 From: "Jamie (Bear) Murphy" <1613241+ITJamie@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:24:17 +0000 Subject: [PATCH] Update Makefile to use Docker Compose V2 syntax Replaced 'docker-compose' with 'docker compose' for compatibility with Docker Compose V2. --- Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9977cc7..1b6bb4b 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,7 @@ SHELL := $(shell which bash) # Get docker path or an empty string DOCKER := $(shell command -v docker) -# Get docker-compose path or an empty string -DOCKER_COMPOSE := $(shell command -v docker-compose) + # Test if the dependencies we need to run this Makefile are installed deps: @@ -14,10 +13,7 @@ ifndef DOCKER @echo "Docker is not available. Please install docker" @exit 1 endif -ifndef DOCKER_COMPOSE - @echo "docker-compose is not available. Please install docker-compose" - @exit 1 -endif + # TODO: for future use, will tag docker build COMMIT := $(shell git rev-list -1 HEAD) @@ -31,7 +27,7 @@ LEMUR_GIT_DIR = lemur-build-docker/lemur clean: deps rm -rf $(LEMUR_GIT_DIR) - docker-compose down -v || sudo docker-compose down -v + docker compose down -v || sudo docker compose down -v all: deps $(MAKE) copy_env_files @@ -48,11 +44,11 @@ lemur_checkout: cd $(LEMUR_GIT_DIR) && git pull build_containers: deps - docker-compose build || sudo docker-compose build || echo "failed to build containers" + docker compose build || sudo docker compose build || echo "failed to build containers" restart_containers: deps - docker-compose stop || sudo docker-compose stop || echo "failed to stop containers" - docker-compose up -d || sudo docker-compose up -d || echo "failed to start containers" + docker compose stop || sudo docker compose stop || echo "failed to stop containers" + docker compose up -d || sudo docker compose up -d || echo "failed to start containers" # TODO: should run with sudo if you do not have access rights to docker inspect_image_size: deps