rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-08 10:08:04 +00:00
Code Issues Releases Wiki Activity

Autoload the predefined user images

Browse Source
This commit is contained in:
niusmallnan 2019-05-16 14:11:17 +08:00 committed by niusmallnan
parent 6e6f7f38d7
commit 679fc1a208
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/control/preload.go
View File

@ -54,6 +54,20 @@ func PreloadImages(clientFactory func() (dockerClient.APIClient, error), imagesD
return err return err
} }
// try to load predefined user images
if imagesDir == userImagesPreloadDirectory {
oldUserImgName := path.Join(config.ImagesPath, config.UserImages)
userImgfile, err := os.Stat(oldUserImgName)
if err == nil {
newUserImgName := path.Join(userImagesPreloadDirectory, userImgfile.Name())
if _, err = os.Stat(newUserImgName); os.IsNotExist(err) {
if err := os.Symlink(oldUserImgName, newUserImgName); err != nil {
log.Error(err)
}
}
}
}
files, err := ioutil.ReadDir(imagesDir) files, err := ioutil.ReadDir(imagesDir)
if err != nil { if err != nil {
return err return err

1
config/types.go
View File

@ -23,6 +23,7 @@ const (
ImagesPath = "/usr/share/ros" ImagesPath = "/usr/share/ros"
InitImages = "images-init.tar" InitImages = "images-init.tar"
SystemImages = "images-system.tar" SystemImages = "images-system.tar"
UserImages = "images-user.tar"
Debug = false Debug = false
SystemDockerBin = "/usr/bin/system-dockerd" SystemDockerBin = "/usr/bin/system-dockerd"
DefaultDind = "rancher/os-dind:17.12.1" DefaultDind = "rancher/os-dind:17.12.1"

3
scripts/tar-images
View File

@ -34,6 +34,9 @@ for i in ${IMAGES}; do
done done
for i in ${APPEND_USER_IMAGES}; do for i in ${APPEND_USER_IMAGES}; do
if ! docker inspect $i >/dev/null 2>&1; then
docker pull ${i}
fi
USER_IMAGES="${USER_IMAGES} ${i}" USER_IMAGES="${USER_IMAGES} ${i}"
done done