From 3bb9c1f583286ad676dccaf3225892d1536dbb93 Mon Sep 17 00:00:00 2001 From: Elliott Davis Date: Tue, 20 Mar 2018 16:47:58 -0500 Subject: [PATCH] Pin core/docker to 17.09.9 for cfize and dockerize We must pin here since these two packages are dependent. If Cfize builds, it pulls a newer version of core/docker than the current hab-pkg-dockerize has so we get a dep conflict. Signed-off-by: Elliott Davis --- components/pkg-cfize/plan.sh | 2 +- components/pkg-dockerize/plan.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/pkg-cfize/plan.sh b/components/pkg-cfize/plan.sh index 3ca74f5f9a..59653846c0 100644 --- a/components/pkg-cfize/plan.sh +++ b/components/pkg-cfize/plan.sh @@ -6,7 +6,7 @@ pkg_description="Habitat Cloud Foundry image exporter" pkg_upstream_url="https://github.com/habitat-sh/habitat" pkg_deps=( core/coreutils core/findutils core/grep core/sed core/gawk core/bash - core/hab-pkg-dockerize core/docker + core/hab-pkg-dockerize core/docker/17.09.0 ) pkg_bin_dirs=(bin) diff --git a/components/pkg-dockerize/plan.sh b/components/pkg-dockerize/plan.sh index 2b20536aec..ca40068e71 100644 --- a/components/pkg-dockerize/plan.sh +++ b/components/pkg-dockerize/plan.sh @@ -4,7 +4,7 @@ pkg_version=$(cat "$PLAN_CONTEXT/../../VERSION") pkg_maintainer="The Habitat Maintainers " pkg_license=('Apache-2.0') pkg_source=nosuchfile.tar.gz -pkg_deps=(core/coreutils core/findutils core/gawk core/grep core/bash core/docker core/hab-studio) +pkg_deps=(core/coreutils core/findutils core/gawk core/grep core/bash core/docker/17.09.0 core/hab-studio) pkg_build_deps=() pkg_bin_dirs=(bin)