fix dist dir creation in docker build (cherry picked from commit 1c8d8aa2c1641506a9e8e3e154b5aacf3805d22e)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8c0dfb8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8c0dfb8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8c0dfb8b Branch: refs/heads/2.0.x Commit: 8c0dfb8b24f74a748a16da2fee116c92e91824ed Parents: d8222fe Author: Dan Kirkwood <dang...@gmail.com> Authored: Wed May 24 21:10:12 2017 +0000 Committer: Eric Friedrich <fri...@apache.org> Committed: Wed May 31 10:08:57 2017 -0400 ---------------------------------------------------------------------- infrastructure/docker/build/clean_build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c0dfb8b/infrastructure/docker/build/clean_build.sh ---------------------------------------------------------------------- diff --git a/infrastructure/docker/build/clean_build.sh b/infrastructure/docker/build/clean_build.sh index 09fc761..51e4fba 100755 --- a/infrastructure/docker/build/clean_build.sh +++ b/infrastructure/docker/build/clean_build.sh @@ -31,9 +31,10 @@ trap cleanup EXIT set -x # set owner of dist dir -- cleans up existing dist permissions... -rm -rf /trafficcontrol/dist && mkdir -p /trafficcontrol/dist +rm -rf /trafficcontrol/dist cp -a /trafficcontrol /tmp/. && \ cd /tmp/trafficcontrol && \ - rm -rf dist && ln -fs /trafficcontrol/dist dist && \ + mkdir -p /trafficcontrol/dist && \ + ln -fs /trafficcontrol/dist dist && \ ((((./build/build.sh $1 2>&1; echo $? >&3) | tee ./dist/build-$1.log >&4) 3>&1) | (read x; exit $x)) 4>&1