rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-16 16:11:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1920 from SvenDowideit/add-apt-cache-build-arg

Browse Source 
Add apt-cacher build arg
(cherry picked from commit 26939ebb7e)
This commit is contained in:
Sven Dowideit 2017-06-15 15:55:30 +10:00
parent 39922220b0
commit cc133372a7
2 changed files with 14 additions and 5 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 arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04
RUN apt-get update && \
apt-get install -y --no-install-recommends \
# get the apt-cacher proxy set
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 \
ca-certificates \
cpio \
@ -32,7 +37,7 @@ RUN apt-get update && \
########## Dapper Configuration #####################
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY
ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /go/src/github.com/rancher/os
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 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 \
zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libdevmapper-dev \
module-init-tools \
@ -30,7 +34,7 @@ RUN mkdir -p /source/dist \
########## Dapper Configuration #####################
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST APTPROXY
#ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /source
ENV DAPPER_OUTPUT ./dist