diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-18 19:42:15 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-31 12:27:59 +0000 |
| commit | 26f171754493ef7cea3f03e16d8c709b9f4a9aab (patch) | |
| tree | 8d2f7ed7d4417f92ca856437cdd3882c0cdb1381 /build/docker/Dockerfile | |
| parent | 63a7354191a77550f45a81ede6d6cc590ce75b3a (diff) | |
repo mirror: Allow multi-arch local mirrors
Original patch from Stan, signed by me for upstreaming.
This patch allows specifying multiple architectures via UBUNTU_ARCH in
form of a list of space separated architectures. The first architecture
in the list is considered primary and will be used for building all the
deb packages by fuel-main. Additional architectures are added to allow
targets of other architectures to use the mirror.
NOTE: this imposes a requirement that all packages built are arch
independent (which is true so far).
[ Alexandru Avadanii ]
Reworked for applying on top of Fuel@OPNFV.
Pass UBUNTU_ARCH to Docker containers.
Change-Id: Ibc4ae03223545383813ac58ec34d44c1f97b4694
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 655e777a5adeb633e114d98ffb02f74b227ab437)
Diffstat (limited to 'build/docker/Dockerfile')
| -rw-r--r-- | build/docker/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 1bb56b795..b38ea4c64 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC # Keeping PWD is needed to build as root RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd # Keeping variables for ISO build -RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU\"" > /etc/sudoers.d/keep-mos +RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos RUN chmod 0440 /etc/sudoers.d/open-sudo RUN chmod 0440 /etc/sudoers.d/keep-proxies RUN chmod 0440 /etc/sudoers.d/keep-pwd |