rancher/os-kernel
1
0
Fork 1
mirror of https://github.com/rancher/os-kernel.git synced 2025-09-16 14:58:15 +00:00
Code Issues Releases Wiki Activity

Update build scripts

Browse Source
This commit is contained in:
niusmallnan
2018-01-18 23:10:33 +08:00
parent 12750759fd
commit fd486228a7
2 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Dockerfile.dapper
View File

@@ -14,63 +14,33 @@ CMD ["ci"]
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
###################### ARG DAPPER_HOST_ARCH=amd64
ENV DAPPER_ENV ARCH VERSION DEV_BUILD GITHUB_TOKEN KERNEL_TAG ENV HOST_ARCH=${DAPPER_HOST_ARCH}
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /source ENV DAPPER_SOURCE /source
ENV DAPPER_OUTPUT ./dist ENV DAPPER_OUTPUT ./dist
#ENV DAPPER_RUN_ARGS --privileged #ENV DAPPER_RUN_ARGS --privileged
######################
ARG KERNEL_TAG=${KERNEL_TAG}
ARG DAPPER_HOST_ARCH=amd64
ARG HOST_ARCH=${DAPPER_HOST_ARCH}
ARG ARCH=${HOST_ARCH}
ENV SHELL /bin/bash ENV SHELL /bin/bash
ENV HOME ${DAPPER_SOURCE} ENV HOME ${DAPPER_SOURCE}
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}
########## General Configuration #####################
ARG OS_REPO=rancher ARG OS_REPO=rancher
ARG DOCKER_VERSION=1.10.3 ARG KERNEL_TAG
ARG DOCKER_PATCH_VERSION=v${DOCKER_VERSION}-ros1 ARG KERNEL_VERSION=${KERNEL_TAG}-${OS_REPO}
ARG ARCH=x86
ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} ENV OS_REPO=${OS_REPO} \
ARG DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm
ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64
######################################################
# Export all ARGS as ENV
ENV DOCKER_URL=DOCKER_URL_${ARCH} \
ARCH=${ARCH} \ ARCH=${ARCH} \
DISTRIB_ID=${DISTRIB_ID} \ DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
DOCKER_PATCH_VERSION=${DOCKER_PATCH_VERSION} \ KERNEL_TAG=${KERNEL_TAG} \
DOCKER_URL=${DOCKER_URL} \ KERNEL_VERSION=${KERNEL_VERSION} \
DOCKER_URL_amd64=${DOCKER_URL_amd64} \ KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/ \
DOCKER_URL_arm64=${DOCKER_URL_arm64} \ KERNEL_TAR=linux-${KERNEL_TAG}.tar.xz \
DOCKER_URL_arm=${DOCKER_URL_arm} \ KERNEL_SIGN=linux-${KERNEL_TAG}.tar.sign
DOCKER_VERSION=${DOCKER_VERSION} \ # for rc testing
HOST_ARCH=${HOST_ARCH} \ #ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-${KERNEL_TAG}.tar.xz
OS_REPO=${OS_REPO} \
KERNEL_TAG=${KERNEL_TAG}
#RUN rm /bin/sh && \
# ln -s /bin/bash /bin/sh
# Install Docker # Install Docker
RUN curl -fL ${DOCKER_URL_amd64} > /usr/bin/docker && \ RUN curl -fL ${DOCKER_URL_amd64} > /usr/bin/docker && \
chmod +x /usr/bin/docker chmod +x /usr/bin/docker
########## Kernel version Configuration #############################
#ENV KERNEL_TAG=4.9.9
ENV KERNEL_VERSION=${KERNEL_TAG}-rancher
#ENV KERNEL_SHA1=fa46da077c077467776cdc45a7b50d327a081ab4
ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/
ENV KERNEL_TAR=linux-${KERNEL_TAG}.tar.xz
ENV KERNEL_SIGN=linux-${KERNEL_TAG}.tar.sign
# for rc testing
#ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-${KERNEL_TAG}.tar.xz

1
scripts/build-images
View File

@@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
export ARCH=${ARCH:-"amd64"}
BASE=images BASE=images
source $(dirname $0)/version source $(dirname $0)/version