From 7623058ae777f908a576dc613dbed3d8d25f32f8 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Tue, 17 Jul 2018 15:46:00 -0700 Subject: [PATCH] Update entrypoint in dockerfile for vmpooler gem This commit updates dockerfile entrypoint to remove the explicit vmpooler executable path. Additionally, CMD is added to run a default command when runtime parameters are not passed in by the user. Without this change the vmpooler executable path is hardcoded into a directory that will not exist. --- docker/Dockerfile | 2 ++ docker/docker-entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 63467bc..9295b3c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,3 +19,5 @@ RUN gem install vmpooler && \ chmod +x /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"] + +CMD ["vmpooler"] diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 9d21ac0..5da89df 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -set -- /var/lib/vmpooler/vmpooler "$@" +set -- vmpooler "$@" exec "$@"