diff --git a/build.sh b/build.sh index 9cbcd2a..11787cf 100755 --- a/build.sh +++ b/build.sh @@ -10,11 +10,10 @@ export DOCKER_IMAGE=rancher-os-kernel-build rm -rf dist echo "Build complete. Copying artifacts..." + DIST_CONTAINER=$(docker create ${DOCKER_IMAGE}) -cleanup() { - docker rm -v ${DIST_CONTAINER} -} -trap cleanup EXIT +trap "docker rm -v ${DIST_CONTAINER}" EXIT + docker cp ${DIST_CONTAINER}:/source/dist/kernel dist ls -lh dist/kernel diff --git a/scripts/ci b/scripts/ci index b87fee7..eadb070 100755 --- a/scripts/ci +++ b/scripts/ci @@ -12,6 +12,5 @@ run --assets ./scripts/build-common \ run ./scripts/download run --assets ./config/kernel-config \ ./scripts/build-kernel -run ./scripts/package finish diff --git a/scripts/package b/scripts/package deleted file mode 100755 index 1eb453e..0000000 --- a/scripts/package +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd $(dirname $0)/.. - -. scripts/build-common - -mkdir -p ${DIST}/artifacts