|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen staging] automation: drop container name from containerize
commit f437ac101f12a6468879177257f20d13621c8740
Author: Doug Goldstein <cardoe@xxxxxxxxxx>
AuthorDate: Fri Aug 3 09:46:47 2018 -0500
Commit: Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri Aug 3 16:11:22 2018 +0100
automation: drop container name from containerize
This was something that existed for some scripting support for a totally
unrelated project and when I copied this script I failed to remove it so
this removes it. Build containers for Xen are best as ephemeral
environments and should just utilizes Docker's default container naming
behavior.
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
automation/build/README.md | 5 -----
automation/scripts/containerize | 7 +------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/automation/build/README.md b/automation/build/README.md
index 987533ac14..bf113175f4 100644
--- a/automation/build/README.md
+++ b/automation/build/README.md
@@ -53,11 +53,6 @@ understands.
- XEN_CONFIG_EXPERT: If this is defined in your shell it will be
automatically passed through to the container.
-- CONTAINER_NAME: By default the container name is set based on the
- container itself so that its easy to attach other terminals to your
- container. This however prevents you from running multiple containers
- of the same version. Override the name value to cause it to name
- the container differently on start.
Building a container
--------------------
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index f4ff24c25a..7f0eb0aff0 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -65,11 +65,6 @@ if [[ -n ${SSH_AUTH_SOCK} ]]; then
fi
fi
-# if we got the CONTAINER_NAME env variable then use that for our name
-if [[ -n ${CONTAINER_NAME} ]]; then
- name="--name ${CONTAINER_NAME}"
-fi
-
# Figure out the base of what we want as our sources
# by using the top of the git repo
if [[ -z ${CONTAINER_PATH} ]]; then
@@ -85,7 +80,7 @@ exec docker run \
-v "${HOME}/.ssh":/root/.ssh:ro \
${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent} \
${XEN_CONFIG_EXPERT:+-e XEN_CONFIG_EXPERT=${XEN_CONFIG_EXPERT}} \
- ${CONTAINER_ARGS} ${name} \
+ ${CONTAINER_ARGS} \
-${termint}i --rm -- \
${CONTAINER} \
${cmd}
--
generated by git-patchbot for /home/xen/git/xen.git#staging
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |