Skip to content

Commit

Permalink
Issue minishift#13 Add crio, podman, buildah and skopeo package
Browse files Browse the repository at this point in the history
  • Loading branch information
praveenkumar committed Oct 3, 2018
1 parent 65268b6 commit 296a168
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
4 changes: 4 additions & 0 deletions fedora.template
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ nfs-utils
go-hvkvp
python-setuptools
dnsmasq
podman
buildah
skopeo
cri-o

#Packages to be removed
-aic94xx-firmware
Expand Down
17 changes: 17 additions & 0 deletions scripts/handle-user-data
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,27 @@ mount_partitions() {
mount --bind /mnt/$PARTNAME/var/lib/docker /var/lib/docker
restorecon -R /var/lib/docker

mkdir -p /mnt/$PARTNAME/var/lib/containers
mkdir -p /var/lib/containers
mount --bind /mnt/$PARTNAME/var/lib/containers /var/lib/containers
restorecon -R /var/lib/containers

mkdir -p /mnt/$PARTNAME/var/lib/boot2docker
mkdir -p /var/lib/boot2docker
mount --bind /mnt/$PARTNAME/var/lib/boot2docker /var/lib/boot2docker

mkdir -p /mnt/$PARTNAME/var/lib/boot2docker/etc/docker
cp -r /etc/docker/* /mnt/$PARTNAME/var/lib/boot2docker/etc/docker
rm -rf /etc/docker
mkdir -p /etc/docker
mount --bind /mnt/$PARTNAME/var/lib/boot2docker/etc/docker /etc/docker

mkdir -p /mnt/$PARTNAME/etc/containers
cp -r /etc/containers/* /mnt/$PARTNAME/etc/containers
rm -rf /etc/containers
mkdir -p /etc/containers
mount --bind /mnt/$PARTNAME/etc/containers /etc/containers

mkdir -p /mnt/$PARTNAME/var/lib/minishift
mkdir -p /var/lib/minishift
mount --bind /mnt/$PARTNAME/var/lib/minishift /var/lib/minishift
Expand Down
2 changes: 1 addition & 1 deletion tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function verify_nfs_installation() {

function verify_bind_mount() {
output=`$BINARY ssh -- 'findmnt | grep "\[/var/lib/" | wc -l'`
assert_equal $output "8"
assert_equal $output "10"
print_success_message "Bind mount check"
}

Expand Down

0 comments on commit 296a168

Please sign in to comment.