OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Dockerfile: remove apt.conf dependency 

There was a assumption /etc/apt/apt.conf has apt proxy settings for
the system. This workaround is not required.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
This commit is contained in:
Fred Oh 2021-05-11 11:14:31 -07:00 committed by Liam Girdwood
parent cbef494ee6
commit c7a527e4bd
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/docker_build/sof_builder/Dockerfile
View File

@ -17,8 +17,6 @@
FROM ubuntu:18.04
ARG UID=1000
# Set up proxy from host
COPY apt.conf /etc/apt/
ARG host_http_proxy
ARG host_https_proxy
ENV http_proxy $host_http_proxy

8
scripts/docker_build/sof_builder/docker-build.sh
View File

@ -2,9 +2,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation. All rights reserved.
if [ -f "/etc/apt/apt.conf" ]; then
cp /etc/apt/apt.conf ./
else
touch apt.conf
fi
docker build --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sof .
docker build --build-arg UID=$(id -u) --build-arg host_http_proxy="$http_proxy" \
--build-arg host_https_proxy="$https_proxy" -t sof .

2
scripts/docker_build/sof_qemu/Dockerfile
View File

@ -15,8 +15,6 @@
FROM ubuntu:18.04
ARG UID=1000
# Set up proxy from host
COPY apt.conf /etc/apt/
ARG host_http_proxy
ARG host_https_proxy
ENV http_proxy $host_http_proxy

8
scripts/docker_build/sof_qemu/docker-build.sh
View File

@ -2,9 +2,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation. All rights reserved.
if [ -f "/etc/apt/apt.conf" ]; then
cp /etc/apt/apt.conf ./
else
touch apt.conf
fi
docker build --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sofqemu .
docker build --build-arg UID=$(id -u) --build-arg host_http_proxy="$http_proxy" \
--build-arg host_https_proxy="$https_proxy" -t sofqemu .