rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-20 18:09:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1934 from SvenDowideit/add-local-caching-to-builds

Browse Source 
Add local caching to builds and integration tests
This commit is contained in:
Sven Dowideit 2017-06-22 10:17:04 +10:00 committed by GitHub
commit ed3f08f0f9
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile.dapper
View File

@ -1,8 +1,13 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
# FROM arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04 # FROM arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04
RUN apt-get update && \ # get the apt-cacher proxy set
apt-get install -y --no-install-recommends \ ARG APTPROXY=
RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01proxy \
&& cat /etc/apt/apt.conf.d/01proxy \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
cpio \ cpio \
@ -32,7 +37,7 @@ RUN apt-get update && \
########## Dapper Configuration ##################### ########## Dapper Configuration #####################
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /go/src/github.com/rancher/os ENV DAPPER_SOURCE /go/src/github.com/rancher/os
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel

8
scripts/installer/kexec/Dockerfile.dapper
View File

@ -1,8 +1,12 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
# FROM arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04 # FROM arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04
# get the apt-cacher proxy set
ARG APTPROXY=
RUN apt-get update \ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01proxy \
&& cat /etc/apt/apt.conf.d/01proxy \
&& apt-get update \
&& apt-get install -yq build-essential autoconf libtool gawk alien fakeroot \ && apt-get install -yq build-essential autoconf libtool gawk alien fakeroot \
zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libdevmapper-dev \ zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libdevmapper-dev \
module-init-tools \ module-init-tools \
@ -30,7 +34,7 @@ RUN mkdir -p /source/dist \
########## Dapper Configuration ##################### ########## Dapper Configuration #####################
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST APTPROXY
#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

6
scripts/run-common
View File

@ -48,4 +48,8 @@ REBUILD=1
QEMUARCH=${qemuarch["${ARCH}"]} QEMUARCH=${qemuarch["${ARCH}"]}
TTYCONS=${ttycons["${ARCH}"]} TTYCONS=${ttycons["${ARCH}"]}
DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.debug=true rancher.password=rancher console=${TTYCONS} rancher.autologin=${TTYCONS}" if [ "$ENGINE_REGISTRY_MIRROR" != "" ]; then
REGISTRY_MIRROR="rancher.bootstrap_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.system_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.docker.registry_mirror=${ENGINE_REGISTRY_MIRROR}"
fi
DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.debug=true rancher.password=rancher console=${TTYCONS} rancher.autologin=${TTYCONS} ${REGISTRY_MIRROR} "