Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compose as a Docker plugin #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compose as a Docker plugin #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down