Skip to content

[DEVIMPR-4] Fix bin/dev multiproject docker-compose service discovery #2

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

Merged
merged 1 commit into from
Apr 2, 2022
Merged

[DEVIMPR-4] Fix bin/dev multiproject docker-compose service discovery #2

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
35 changes: 20 additions & 15 deletions assets/bin/dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -eu

cd $(dirname "$0")/../../
COMPOSE="docker-compose"
COMPOSE_SERVICE="app"

if [ ! -f "docker-compose.yml" ]; then
COMPOSE_SERVICE=$(basename $(pwd))
fi

function app_require_env() {
if [ ! -f .env ]; then
Expand All @@ -14,7 +19,7 @@ function app_require_env() {
}

function app_require_up() {
if [ -z $($COMPOSE ps -q app) ] || [ -z $(docker ps -q --no-trunc | grep $($COMPOSE ps -q app)) ]; then
if [ -z $($COMPOSE ps -q $COMPOSE_SERVICE) ] || [ -z $(docker ps -q --no-trunc | grep $($COMPOSE ps -q $COMPOSE_SERVICE)) ]; then
echo -e "\033[0;31mApp container not up!\033[0m, Please run:"
echo "$0 up"
exit 1
Expand All @@ -38,19 +43,19 @@ function app_exec() {
app_require_env
app_require_up
if [ -n "${COMPOSER_BINARY:-}" ]; then
exec $COMPOSE exec -T app $@
exec $COMPOSE exec -T $COMPOSE_SERVICE $@
else
exec $COMPOSE exec app $@
exec $COMPOSE exec $COMPOSE_SERVICE $@
fi
}

function app_run() {
app_require_env
app_require_up
if [ -n "${COMPOSER_BINARY:-}" ]; then
$COMPOSE exec -T app $@
$COMPOSE exec -T $COMPOSE_SERVICE $@
else
$COMPOSE exec app $@
$COMPOSE exec $COMPOSE_SERVICE $@
fi
}

Expand All @@ -62,36 +67,36 @@ function app_logs() {
function package_dev_init() {
package=$1
package_name=$(basename "$package")
info=$($COMPOSE run --no-deps --rm app bash -c "composer show -l -f json \"$package\" 2>/dev/null")
info=$($COMPOSE run --no-deps --rm $COMPOSE_SERVICE bash -c "composer show -l -f json \"$package\" 2>/dev/null")

#TODO: check if package exists
giturl=$(jq -r '.source | select(.type == "git") | .url'<<<"$info")
latest=$(jq -r '.latest'<<<"$info")
next=$(echo "$latest" | awk -F. -v OFS=. '{$NF+=1;print}')

git clone $giturl ./packages/${package_name}

composer=$(jq ".version = \"$next\"" ./packages/${package_name}/composer.json)
echo -n "$composer" > "./packages/${package_name}/composer.json"
$COMPOSE run --no-deps --rm app composer update "$package"

$COMPOSE run --no-deps --rm $COMPOSE_SERVICE composer update "$package"
}

function package_dev_done() {
package=$1
package_name=$(basename "$package")

if [ ! -d "packages/${package_name}" ]; then
echo "Package $package not found in packages dir"
exit 1;
fi

#TODO: check if changes committed

rm -rf "vendor/${package}" "packages/${package_name}"

#TODO: increment minimal version in composer.json
$COMPOSE run --no-deps --rm app composer update "$package"
$COMPOSE run --no-deps --rm $COMPOSE_SERVICE composer update "$package"
}

function usage() {
Expand Down