Merge pull request #753 from bgilbert/docker

build_torcx_store: add docker 1.12 to the image
This commit is contained in:
Benjamin Gilbert 2017-09-21 17:16:41 -07:00 committed by GitHub
commit 9b78a27d0a

View File

@ -218,14 +218,13 @@ function torcx_package() {
# for each package will point at the last version specified. This can handle # for each package will point at the last version specified. This can handle
# swapping default package versions for different OS releases by reordering. # swapping default package versions for different OS releases by reordering.
DEFAULT_IMAGES=( DEFAULT_IMAGES=(
=app-torcx/docker-1.12
=app-torcx/docker-17.06 =app-torcx/docker-17.06
) )
# This list contains extra images which will be uploaded and included in the # This list contains extra images which will be uploaded and included in the
# generated manifest, but won't be included in the vendor store. # generated manifest, but won't be included in the vendor store.
EXTRA_IMAGES=( EXTRA_IMAGES=()
=app-torcx/docker-1.12
)
mkdir -p "${BUILD_DIR}" mkdir -p "${BUILD_DIR}"
manifest_path="${BUILD_DIR}/torcx_manifest.json" manifest_path="${BUILD_DIR}/torcx_manifest.json"