mirror of
https://github.com/openstf/stf
synced 2025-10-04 18:29:17 +02:00
Allow user-specified name for alpine image.
This commit is contained in:
parent
0df3285160
commit
1cda2a01ab
1 changed files with 7 additions and 8 deletions
|
@ -11,7 +11,7 @@ set -e
|
||||||
}
|
}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
printf >&2 '%s: [-r release] [-m mirror] [-s] [-c additional repository]\n' "$0"
|
printf >&2 '%s: [-r release] [-m mirror] [-s] [-i image]\n' "$0"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,10 +45,8 @@ conf() {
|
||||||
|
|
||||||
pack() {
|
pack() {
|
||||||
local id
|
local id
|
||||||
id=$(tar --numeric-owner -C $ROOTFS -c . | docker import - alpine:$REL)
|
id=$(tar --numeric-owner -C $ROOTFS -c . | docker import - $IMAGE)
|
||||||
|
docker run -i -t --rm $IMAGE printf '%s with id=%s created!\n' $IMAGE $id
|
||||||
docker tag $id alpine:latest
|
|
||||||
docker run -i -t --rm alpine printf 'alpine:%s with id=%s created!\n' $REL $id
|
|
||||||
}
|
}
|
||||||
|
|
||||||
save() {
|
save() {
|
||||||
|
@ -57,7 +55,7 @@ save() {
|
||||||
tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
|
tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
|
||||||
}
|
}
|
||||||
|
|
||||||
while getopts "hr:m:s" opt; do
|
while getopts "hr:m:si:" opt; do
|
||||||
case $opt in
|
case $opt in
|
||||||
r)
|
r)
|
||||||
REL=$OPTARG
|
REL=$OPTARG
|
||||||
|
@ -68,8 +66,8 @@ while getopts "hr:m:s" opt; do
|
||||||
s)
|
s)
|
||||||
SAVE=1
|
SAVE=1
|
||||||
;;
|
;;
|
||||||
c)
|
i)
|
||||||
ADDITIONALREPO=community
|
IMAGE=$OPTARG
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
usage
|
usage
|
||||||
|
@ -83,6 +81,7 @@ SAVE=${SAVE:-0}
|
||||||
MAINREPO=$MIRROR/$REL/main
|
MAINREPO=$MIRROR/$REL/main
|
||||||
ADDITIONALREPO=$MIRROR/$REL/community
|
ADDITIONALREPO=$MIRROR/$REL/community
|
||||||
ARCH=${ARCH:-$(uname -m)}
|
ARCH=${ARCH:-$(uname -m)}
|
||||||
|
IMAGE=${IMAGE:-alpine:$REL}
|
||||||
|
|
||||||
tmp
|
tmp
|
||||||
getapk
|
getapk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue