Browse Source

fix: [docker-builder,host] update path when using ``0k-docker`` scripts

framadate
Valentin Lab 6 years ago
parent
commit
bcdbb12061
  1. 2
      precise/docker-builder/hooks/install
  2. 4
      precise/host/hooks/install.d/70-0k.sh

2
precise/docker-builder/hooks/install

@ -15,7 +15,7 @@ cp src/usr/local/sbin/* src/usr/local/sbin/
## install ## install
## - 0k-docker for docker-build-charm ## - 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 ## - 0k-charm for charms
ln -sf /opt/apps/0k-charms/precise /srv/charm-store ln -sf /opt/apps/0k-charms/precise /srv/charm-store

4
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" git clone $GIT_0K_CLONE_OPTIONS "$GIT_0K_BASE/0k/0k-docker"
fi 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 ## 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 find -L /usr/local/sbin -maxdepth 1 -type l -ilname /opt/apps/0k-docker/\* -delete
) )

Loading…
Cancel
Save