diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-08-31 12:01:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-31 12:01:24 +0000 |
| commit | 6222031ed4e195fee85d6e3bdb5f34845fa061e9 (patch) | |
| tree | 652ddbf39f7fc65905429b98ad30f0e13f36e277 /build/docker/Dockerfile | |
| parent | 7cff3184b3cefae5894eeef78bb3490818bc8141 (diff) | |
| parent | 1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a (diff) | |
Merge changes from topic 'multiarch-mirrors'
* changes:
build: cache: Consider UBUNTU_ARCH in .cacheid
repo mirror: Allow multi-arch local mirrors
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 |