From 60acf68412c4e13dd48245939da07c4a579b9304 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 22 Aug 2022 21:49:54 -0400 Subject: [PATCH] feat: use container name instead of container id for run:detached output Closes #5170 --- docs/appendices/0.29.0-migration-guide.md | 5 +++++ docs/getting-started/upgrading/index.md | 1 + plugins/scheduler-docker-local/scheduler-run | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docs/appendices/0.29.0-migration-guide.md diff --git a/docs/appendices/0.29.0-migration-guide.md b/docs/appendices/0.29.0-migration-guide.md new file mode 100644 index 000000000..9b4b6d0c9 --- /dev/null +++ b/docs/appendices/0.29.0-migration-guide.md @@ -0,0 +1,5 @@ +# 0.29.0 Migration Guide + +## Changes + +The output of `run:detached` now uses the container name - eg. `node-js-app.run.1` - vs the container id. diff --git a/docs/getting-started/upgrading/index.md b/docs/getting-started/upgrading/index.md index e45026086..3977f6eae 100644 --- a/docs/getting-started/upgrading/index.md +++ b/docs/getting-started/upgrading/index.md @@ -18,6 +18,7 @@ Docker releases updates periodically to their engine. We recommend reading their Before upgrading, check the migration guides to get comfortable with new features and prepare your deployment to be upgraded. +- [Upgrading to 0.29](/docs/appendices/0.29.0-migration-guide.md) - [Upgrading to 0.28](/docs/appendices/0.28.0-migration-guide.md) - [Upgrading to 0.27](/docs/appendices/0.27.0-migration-guide.md) - [Upgrading to 0.26](/docs/appendices/0.26.0-migration-guide.md) diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run index dcf182502..b58d5b970 100755 --- a/plugins/scheduler-docker-local/scheduler-run +++ b/plugins/scheduler-docker-local/scheduler-run @@ -122,7 +122,7 @@ trigger-scheduler-docker-local-scheduler-run() { local EXIT_CODE=0 DOKKU_CONTAINER_EXIT_CODE=0 if [[ "$DOKKU_DETACH_CONTAINER" == "1" ]]; then "$DOCKER_BIN" container start "${DOCKER_START_ARGS_ARRAY[@]}" "$CONTAINER_ID" >/dev/null || DOKKU_CONTAINER_EXIT_CODE=$? - echo "$CONTAINER_ID" + "$DOCKER_BIN" container inspect --format "{{.Name}}" "$CONTAINER_ID" | cut -c2- else "$DOCKER_BIN" container start "${DOCKER_START_ARGS_ARRAY[@]}" "$CONTAINER_ID" || EXIT_CODE=$? DOKKU_CONTAINER_EXIT_CODE="$("$DOCKER_BIN" container wait "$CONTAINER_ID" 2>/dev/null || echo "$EXIT_CODE")"