From bcdbb120613df85a189c369cd0f006574967b4a9 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Thu, 27 Dec 2018 08:13:45 +0100 Subject: [PATCH] fix: [docker-builder,host] update path when using ``0k-docker`` scripts --- precise/docker-builder/hooks/install | 2 +- precise/host/hooks/install.d/70-0k.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/precise/docker-builder/hooks/install b/precise/docker-builder/hooks/install index 4927894..55df185 100755 --- a/precise/docker-builder/hooks/install +++ b/precise/docker-builder/hooks/install @@ -15,7 +15,7 @@ cp src/usr/local/sbin/* src/usr/local/sbin/ ## install ## - 0k-docker for docker-build-charm -ln -sf /opt/apps/0k-docker/bin/docker-build-charm /usr/local/sbin +ln -sf /opt/apps/0k-docker/src/bin/docker-build-charm /usr/local/sbin ## - 0k-charm for charms ln -sf /opt/apps/0k-charms/precise /srv/charm-store diff --git a/precise/host/hooks/install.d/70-0k.sh b/precise/host/hooks/install.d/70-0k.sh index d9a18d5..3f02fd0 100755 --- a/precise/host/hooks/install.d/70-0k.sh +++ b/precise/host/hooks/install.d/70-0k.sh @@ -144,8 +144,8 @@ fi git clone $GIT_0K_CLONE_OPTIONS "$GIT_0K_BASE/0k/0k-docker" fi - ln -sfn /opt/apps/0k-docker/bin/* /usr/local/sbin/ - ln -sfn /opt/apps/0k-docker/bin/docker-clean /etc/cron.daily/docker-clean + ln -sfn /opt/apps/0k-docker/src/bin/* /usr/local/sbin/ + ln -sfn /opt/apps/0k-docker/src/bin/docker-clean /etc/cron.daily/docker-clean ## in update, will remove broken links to binaries that were removed find -L /usr/local/sbin -maxdepth 1 -type l -ilname /opt/apps/0k-docker/\* -delete )