mirror of
https://github.com/rancher/os.git
synced 2025-08-01 23:17:50 +00:00
Use os-initrd-base instead of DFS_IMAGE
This commit is contained in:
parent
922fd63f61
commit
971f295092
@ -70,11 +70,13 @@ ARG OS_RELEASES_YML=https://releases.rancher.com/os
|
|||||||
|
|
||||||
ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
|
ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
|
||||||
ARG IMAGE_NAME=${OS_REPO}/os
|
ARG IMAGE_NAME=${OS_REPO}/os
|
||||||
ARG DFS_IMAGE=${OS_REPO}/docker:v1.11.2-2
|
|
||||||
|
|
||||||
ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2018.02.7-1/os-base_amd64.tar.xz
|
ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2018.02.7-1/os-base_amd64.tar.xz
|
||||||
ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2018.02.7-1/os-base_arm64.tar.xz
|
ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2018.02.7-1/os-base_arm64.tar.xz
|
||||||
|
|
||||||
|
ARG OS_INITRD_BASE_URL_amd64=https://github.com/niusmallnan/os-initrd-base/releases/download/v2018.02.7-1/os-initrd-base-amd64.tar.gz
|
||||||
|
ARG OS_INITRD_BASE_URL_arm64=https://github.com/niusmallnan/os-initrd-base/releases/download/v2018.02.7-1/os-initrd-base-arm64.tar.gz
|
||||||
|
|
||||||
ARG SYSTEM_DOCKER_VERSION=17.06-ros4
|
ARG SYSTEM_DOCKER_VERSION=17.06-ros4
|
||||||
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
|
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
|
||||||
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
|
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
|
||||||
@ -91,7 +93,6 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
|
|||||||
BUILD_DOCKER_URL_amd64=${BUILD_DOCKER_URL_amd64} \
|
BUILD_DOCKER_URL_amd64=${BUILD_DOCKER_URL_amd64} \
|
||||||
BUILD_DOCKER_URL_arm64=${BUILD_DOCKER_URL_arm64} \
|
BUILD_DOCKER_URL_arm64=${BUILD_DOCKER_URL_arm64} \
|
||||||
DAPPER_HOST_ARCH=${DAPPER_HOST_ARCH} \
|
DAPPER_HOST_ARCH=${DAPPER_HOST_ARCH} \
|
||||||
DFS_IMAGE=${DFS_IMAGE} \
|
|
||||||
DISTRIB_ID=${DISTRIB_ID} \
|
DISTRIB_ID=${DISTRIB_ID} \
|
||||||
DOWNLOADS=/usr/src/downloads \
|
DOWNLOADS=/usr/src/downloads \
|
||||||
GOPATH=/go \
|
GOPATH=/go \
|
||||||
@ -103,10 +104,12 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
|
|||||||
KERNEL_URL=KERNEL_URL_${ARCH} \
|
KERNEL_URL=KERNEL_URL_${ARCH} \
|
||||||
KERNEL_URL_amd64=${KERNEL_URL_amd64} \
|
KERNEL_URL_amd64=${KERNEL_URL_amd64} \
|
||||||
KERNEL_URL_arm64=${KERNEL_URL_arm64} \
|
KERNEL_URL_arm64=${KERNEL_URL_arm64} \
|
||||||
OS_BASE_SHA1=OS_BASE_SHA1_${ARCH} \
|
|
||||||
OS_BASE_URL=OS_BASE_URL_${ARCH} \
|
OS_BASE_URL=OS_BASE_URL_${ARCH} \
|
||||||
OS_BASE_URL_amd64=${OS_BASE_URL_amd64} \
|
OS_BASE_URL_amd64=${OS_BASE_URL_amd64} \
|
||||||
OS_BASE_URL_arm64=${OS_BASE_URL_arm64} \
|
OS_BASE_URL_arm64=${OS_BASE_URL_arm64} \
|
||||||
|
OS_INITRD_BASE_URL=OS_INITRD_BASE_URL_${ARCH} \
|
||||||
|
OS_INITRD_BASE_URL_amd64=${OS_INITRD_BASE_URL_amd64} \
|
||||||
|
OS_INITRD_BASE_URL_arm64=${OS_INITRD_BASE_URL_arm64} \
|
||||||
OS_RELEASES_YML=${OS_RELEASES_YML} \
|
OS_RELEASES_YML=${OS_RELEASES_YML} \
|
||||||
OS_REPO=${OS_REPO} \
|
OS_REPO=${OS_REPO} \
|
||||||
OS_SERVICES_REPO=${OS_SERVICES_REPO} \
|
OS_SERVICES_REPO=${OS_SERVICES_REPO} \
|
||||||
|
@ -12,13 +12,6 @@ export ARTIFACTS BUILD INITRD_DIR VERSION
|
|||||||
./scripts/layout-initrd
|
./scripts/layout-initrd
|
||||||
./scripts/layout-kernel
|
./scripts/layout-kernel
|
||||||
|
|
||||||
DFS_ARCH=$(docker create ${DFS_IMAGE}${SUFFIX})
|
curl -sL ${!OS_INITRD_BASE_URL} | tar xzvf - -C ${INITRD_DIR}
|
||||||
trap "docker rm -fv ${DFS_ARCH} >/dev/null" EXIT
|
|
||||||
docker export ${DFS_ARCH} | tar xf - -C ${INITRD_DIR} --exclude=usr/bin/docker* \
|
|
||||||
--exclude=usr/share/git-core \
|
|
||||||
--exclude=usr/bin/git \
|
|
||||||
--exclude=usr/bin/ssh \
|
|
||||||
--exclude=usr/libexec \
|
|
||||||
usr
|
|
||||||
|
|
||||||
./scripts/hash-initrd
|
./scripts/hash-initrd
|
||||||
|
Loading…
Reference in New Issue
Block a user