diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 3 | ||||
| -rwxr-xr-x | scripts/create_image.sh | 2 | ||||
| -rwxr-xr-x | scripts/rootfs.sh | 20 |
3 files changed, 17 insertions, 8 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9959f7e..b0854aa 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -30,8 +30,7 @@ bootstrap_clean_common() { rm -rf /usr/share/info/* rm -rf /var/cache/pacman/pkg/* rm -rf /var/log/* - rm -f /bootstrap.sh - rm -f /run_bootstrap.sh + rm -f /*.sh } bootstrap_hostname() { diff --git a/scripts/create_image.sh b/scripts/create_image.sh index 131028a..938fe4d 100755 --- a/scripts/create_image.sh +++ b/scripts/create_image.sh @@ -3,4 +3,6 @@ . ../scripts/rootfs.sh . ./vars.sh +rootfs_clean_pacman + rootfs_to_docker ${IMAGE_NAME} ${IMAGE_ARGS[@]} diff --git a/scripts/rootfs.sh b/scripts/rootfs.sh index 000beda..a30ea18 100755 --- a/scripts/rootfs.sh +++ b/scripts/rootfs.sh @@ -84,7 +84,19 @@ rootfs_bootstrap() { chmod +x ${RUN_BOOTSTRAP} ## run the bootstrap script. - arch-chroot "$ROOTFS" /bin/sh -c "/`basename ${RUN_BOOTSTRAP}`" + ${SCRIPTD}/arch-chroot.sh "$ROOTFS" /bin/sh -c "/`basename ${RUN_BOOTSTRAP}`" + wait +} + +rootfs_uninstall() { + echo "==> uninstalling packages ..." + pacman -r "$ROOTFS" -Rdd --noconfirm ${PKGS_REMOVED} +} + +rootfs_clean_pacman() { + echo "==> remove pacman db and local ..." + rm -rf "${ROOTFS}/var/lib/pacman/sync/*" + rm -rf "${ROOTFS}/var/lib/pacman/local/*" } ## @@ -102,6 +114,7 @@ rootfs_main() { rootfs_install rootfs_copy rootfs_bootstrap + rootfs_uninstall } rootfs_backup() { @@ -121,11 +134,6 @@ rootfs_backup() { ## Convert rootfs to docker image. ## rootfs_to_docker() { - if [[ $# < 2 ]]; then - echo "args: rootfs_to_docker [image-name] [options]" - exit 1 - fi - rootfs_backup sudo tar --numeric-owner --xattrs --acls -C "$ROOTFS" -c . | |