From 7e02393d0c7962c6b30d1f00db3f06b0a63271eb Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Thu, 18 Jul 2024 14:47:32 -0500 Subject: [PATCH] Compose as a Docker plugin --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 97893b07..8846fb2b 100755 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ PKG_CONFIG_PATH=/src/lib/lib/pkgconfig CPU_COUNT=`nproc || echo 1` # PRELOAD_ASSETS+=php.ini -DOCKER_ENV=PHP_DIST_DIR=${PHP_DIST_DIR} docker-compose -p phpwasm run -T --rm -e PKG_CONFIG_PATH=${PKG_CONFIG_PATH} +DOCKER_ENV=PHP_DIST_DIR=${PHP_DIST_DIR} docker compose -p phpwasm run -T --rm -e PKG_CONFIG_PATH=${PKG_CONFIG_PATH} DOCKER_RUN=${DOCKER_ENV} emscripten-builder DOCKER_RUN_IN_PHP=${DOCKER_ENV} -w /src/third_party/php${PHP_VERSION}-src/ emscripten-builder @@ -761,14 +761,14 @@ hooks: git config core.hooksPath githooks image: - docker-compose build --progress plain + docker compose build --progress plain # docker-compose --progress quiet build pull-image: - docker-compose --progress quiet pull + docker compose --progress quiet pull push-image: - docker-compose --progress quiet push + docker compose --progress quiet push save-image: mkdir -p ./image