mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 12:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #758 from bgilbert/docker-flag-1520

Browse Source 
Add Docker 17.06 to the image for 1520
This commit is contained in:
Benjamin Gilbert 2017-09-26 16:15:37 -07:00 committed by GitHub
commit 2c08a15c3a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/vm_image_util.sh
View File

@ -229,11 +229,13 @@ IMG_brightbox_OEM_USE=brightbox
IMG_pxe_DISK_FORMAT=cpio
IMG_pxe_PARTITIONED_IMG=0
IMG_pxe_CONF_FORMAT=pxe
IMG_pxe_MEM=2048
## iso, which is an cpio image
IMG_iso_DISK_FORMAT=iso
IMG_iso_PARTITIONED_IMG=0
IMG_iso_CONF_FORMAT=iso
IMG_iso_MEM=2048
## gce, image tarball
IMG_gce_DISK_LAYOUT=vm

5
build_torcx_store
View File

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