rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Fix installer build

Browse Source
This commit is contained in:
Ivan Mikushin
2016-06-13 16:33:07 -07:00
parent 07d475cecb
commit a640bdb758
8 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/installer/Dockerfile.amd64
View File

@@ -2,9 +2,11 @@ FROM debian:jessie
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y grub2 parted kexec-tools
COPY conf lay-down-os seed-data set-disk-partitions /scripts/installer/
COPY ./build/build.conf /scripts/
COPY conf lay-down-os seed-data set-disk-partitions /scripts/
COPY ./build/vmlinuz /dist/vmlinuz
COPY ./build/initrd /dist/initrd
ARG VERSION
ENV VERSION=${VERSION}
ENTRYPOINT ["/scripts/lay-down-os"]

6
scripts/installer/Dockerfile.arm64
View File

@@ -9,9 +9,11 @@ RUN mkdir -p /usr/local/src && \
git clone https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
cd kexec-tools && git checkout kdump/for-14 && ./bootstrap && ./configure && make && make install
COPY conf lay-down-os seed-data set-disk-partitions /scripts/installer/
COPY ./build/build.conf /scripts/
COPY conf lay-down-os seed-data set-disk-partitions /scripts/
COPY ./build/vmlinuz /dist/vmlinuz
COPY ./build/initrd /dist/initrd
ARG VERSION
ENV VERSION=${VERSION}
ENTRYPOINT ["/scripts/lay-down-os"]

1
scripts/installer/lay-down-os
View File

@@ -3,7 +3,6 @@ set -e -x
SCRIPTS_DIR=$(dirname ${0})
. "${SCRIPTS_DIR}/build.conf"
VERSION=${VERSION:?"VERSION not set"}
while getopts "i:f:c:d:t:r:o:p:ka:" OPTION

2
scripts/integration-test
View File

@@ -2,6 +2,8 @@
# help: Run Python based integration tests
set -e
source $(dirname $0)/version
cd $(dirname $0)/../tests/integration
if [ ! -e ../../dist/artifacts/initrd ]; then

3
scripts/package-installer
View File

@@ -14,9 +14,8 @@ fi
mkdir -p ./scripts/installer/build
cp ./dist/artifacts/{initrd,vmlinuz} ./scripts/installer/build
echo VERSION=$VERSION > ./scripts/installer/build/build.conf
trap "rm -rf ./scripts/installer/build" EXIT
docker build -t ${OS_REPO}/os:${VERSION}${SUFFIX} -f $DOCKERFILE ./scripts/installer
docker build -t ${OS_REPO}/os:${VERSION}${SUFFIX} --build-arg VERSION=${VERSION} -f $DOCKERFILE ./scripts/installer
echo ${OS_REPO}/os:${VERSION}${SUFFIX} > dist/images
echo Built ${OS_REPO}/os:${VERSION}${SUFFIX}