Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions compose/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ help:
@echo "$(call format,cache-clean,'Access the cache-clean CLI.')"
@echo "$(call format,cli,'Run any CLI command without going into the bash prompt.')"
@echo "$(call format,clinotty,'Run any CLI command with no TTY.')"
@echo "$(call format,cliq,'Run any CLI command but pipes all output to /dev/null.')"
@echo "$(call format,cliq,'Run any CLI command but pipe all output to /dev/null.')"
@echo "$(call format,composer,'Run the composer binary.')"
@echo "$(call format,copyfromcontainer,'Copy folders or files from container to host.')"
@echo "$(call format,copytocontainer,'Copy folders or files from host to container.')"
Expand All @@ -45,7 +45,7 @@ help:
@echo "$(call format,pwa-studio,'(BETA) Start the PWA Studio server.')"
@echo "$(call format,redis,'Run a command from the redis container.')"
@echo "$(call format,remove,'Remove all containers.')"
@echo "$(call format,removeall,'Remove all containers$(comma) networks$(comma) volumes$(comma) and images.')"
@echo "$(call format,removeall,'Remove all containers$(comma) networks$(comma) volumes and images.')"
@echo "$(call format,removevolumes,'Remove all volumes.')"
@echo "$(call format,restart,'Stop and then start all containers.')"
@echo "$(call format,root,'Run any CLI command as root without going into the bash prompt.')"
Expand All @@ -60,7 +60,7 @@ help:
@echo "$(call format,start,'Start all containers.')"
@echo "$(call format,status,'Check the container status.')"
@echo "$(call format,stop,'Stop all containers.')"
@echo "$(call format,update,'Stop all containers.')"
@echo "$(call format,update,'Update your project to the latest version of docker-magento.')"
@echo "$(call format,xdebug,'Disable or enable Xdebug.')"

bash:
Expand Down
2 changes: 1 addition & 1 deletion compose/bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ bin/clinotty bin/magento cache:flush
echo "Installing cron, run 'bin/cron start' to enable..."
bin/clinotty bin/magento cron:install

echo "Turning on developer mode.."
echo "Turning on developer mode..."
bin/clinotty bin/magento deploy:mode:set developer

mv .vscode src/
Expand Down
4 changes: 2 additions & 2 deletions compose/bin/setup-composer-auth
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PUBLIC_KEY="$(bin/clinotty composer config --global $MAGENTO_USERNAME_PROP 2>/de
PRIVATE_KEY="$(bin/clinotty composer config --global $MAGENTO_PASSWORD_PROP 2>/dev/null)"

if [ -n "$PUBLIC_KEY" ] && [ -n "$PRIVATE_KEY" ]; then
echo "Composer auth has already been setup."
echo "Composer auth has already been set up."
exit 0
fi

Expand Down Expand Up @@ -36,4 +36,4 @@ echo "composer config --global http-basic.repo.magento.com ${PUBLIC_KEY} ${PRIVA
# Also make sure alternate auth.json is setup (Magento uses this internally)
bin/clinotty [ -d "./var/composer_home" ] && bin/clinotty cp /var/www/.composer/auth.json ./var/composer_home/auth.json

echo "Composer auth has been setup."
echo "Composer auth has been set up."