Skip to content

[WIP] Upgrade base Ubuntu to 20.04 for SOF docker images #4173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fredoh9 wants to merge 5 commits into from
Closed

[WIP] Upgrade base Ubuntu to 20.04 for SOF docker images #4173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2234b1b
docker-run.sh: set http/https proxy when docker run
fredoh9 May 11, 2021
bd1033c
docker-run.sh: minor alignment fix
fredoh9 May 11, 2021
d225033
Dockerfile: remove apt.conf at the end
fredoh9 May 11, 2021
abeccec
Dockerfile: add vim to apt install list
fredoh9 May 11, 2021
bd8c7ec
docker: upgrade base ubuntu image to 20.04
May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ fi
docker run -i -v "$(pwd)":/home/sof/work/sof.git \
--env CMAKE_BUILD_TYPE \
--env PRIVATE_KEY_OPTION \
--user "$(id -u)" \
--env http_proxy=${http_proxy} \
--env https_proxy=${https_proxy} \
--user "$(id -u)" \
$SOF_DOCKER_RUN \
sof "$@"
sof "$@"
13 changes: 11 additions & 2 deletions scripts/docker_build/sof_builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,24 @@
# docker run -it -v <insert sof dir here>:/home/sof/work/sof.git --user `id -u` sof ./incremental.sh
#

FROM ubuntu:18.04
FROM ubuntu:20.04
ARG UID=1000

# Set up proxy from host
# Set up proxy from host, this will be deleted at the end
COPY apt.conf /etc/apt/
ARG host_http_proxy
ARG host_https_proxy
ENV http_proxy $host_http_proxy
ENV https_proxy $host_https_proxy

# for non-interactive package install
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update && \
apt-get install -y \
dialog \
apt-utils \
vim \
autoconf \
bison \
build-essential \
Expand Down Expand Up @@ -115,3 +121,6 @@ RUN mkdir -p /home/sof/work/sof.git

USER sof
WORKDIR /home/sof/work/sof.git/

# delete apt proxy setting
RUN rm /etc/apt/apt.conf
7 changes: 6 additions & 1 deletion scripts/docker_build/sof_qemu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ./scripts/docker-qemu.sh scrpits-or-command-you-want-run
#

FROM ubuntu:18.04
FROM ubuntu:20.04
ARG UID=1000

# Set up proxy from host
Expand All @@ -22,8 +22,13 @@ ARG host_https_proxy
ENV http_proxy $host_http_proxy
ENV https_proxy $host_https_proxy

# for non-interactive package install
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update && \
apt-get install -y \
dialog \
apt-utils \
autoconf \
build-essential \
git \
Expand Down