diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 7768bbf..686648d 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -62,7 +62,7 @@ RUN curl -fL ${DOCKER_URL_amd64} > /usr/bin/docker && \ chmod +x /usr/bin/docker ########## Kernel version Configuration ############################# -ENV KERNEL_TAG=4.9.1 +ENV KERNEL_TAG=4.9.2 ENV KERNEL_VERSION=${KERNEL_TAG}-rancher #ENV KERNEL_SHA1=fa46da077c077467776cdc45a7b50d327a081ab4 ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/ diff --git a/config/kernel-config b/config/kernel-config index cbad056..5719b50 100644 --- a/config/kernel-config +++ b/config/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.1 Kernel Configuration +# Linux/x86 4.9.2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/scripts/ci b/scripts/ci index 3db1204..9521f39 100755 --- a/scripts/ci +++ b/scripts/ci @@ -9,23 +9,3 @@ cd $(dirname $0)/.. ./scripts/package-kernel ./scripts/build-images -echo -echo "--- ${KERNEL_VERSION} Kernel prepared for RancherOS" -echo " ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz" -echo " ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz" -echo " ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz" -echo " ./dist/kernel/config" -echo -echo "Images ready to push:" -cat dist/images -echo - -echo "--- Run" -echo "github-release release --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --pre-release" -echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz --name build-linux-${KERNEL_VERSION}-x86.tar.gz" -echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/config --name config" -echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz --name extra-linux-${KERNEL_VERSION}-x86.tar.gz" -echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz --name linux-${KERNEL_VERSION}-x86.tar.gz" -echo - -cat dist/images | sed 's/^/docker push /' diff --git a/scripts/release b/scripts/release index 7af0df3..3e03611 100755 --- a/scripts/release +++ b/scripts/release @@ -1,3 +1,27 @@ #!/bin/bash -exec $(dirname $0)/ci +$(dirname $0)/ci 2>&1 | tee $(dirname $0)/../dist/build.log + +echo +echo "--- ${KERNEL_VERSION} Kernel prepared for RancherOS" +echo " ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz" +echo " ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz" +echo " ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz" +echo " ./dist/kernel/config" +echo " ./dist/build.log" +echo +echo "Images ready to push:" +cat dist/images +echo +echo "to publish kernel files and container images, run dist/publish.sh" + +echo "#!/bin/sh"> dist/publish.sh +echo "github-release release --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --pre-release" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz --name build-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/config --name config" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz --name extra-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz --name linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/build.log --name build.log" >> dist/publish.sh + +cat dist/images | sed 's/^/docker push /' >> dist/publish.sh +chmod 755 dist/publish.sh