Skip to content

[RFC] scripts: docker build changes to support enum control #3652

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
juimonen wants to merge 1 commit into from
Closed

[RFC] scripts: docker build changes to support enum control #3652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 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 @@ -59,8 +59,8 @@ ENV HOME /home/sof

# Use ToT alsa utils for the latest topology patches.
RUN mkdir -p /home/sof/work/alsa && cd /home/sof/work/alsa && \
git clone $CLONE_DEFAULTS https://github.com/thesofproject/alsa-lib.git && \
git clone $CLONE_DEFAULTS https://github.com/thesofproject/alsa-utils.git && \
git clone $CLONE_DEFAULTS https://github.com/alsa-project/alsa-lib.git && \
Copy link
Member

@lgirdwood lgirdwood Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would hold off here as there are some alsa-lib patches being worked on for topology 2.0. Best to just update our local copies of alsa-lib etc in the mean time.

git clone $CLONE_DEFAULTS https://github.com/alsa-project/alsa-utils.git && \
cd /home/sof/work/alsa/alsa-lib && ./gitcompile && make install && \
cd /home/sof/work/alsa/alsa-utils && ./gitcompile && make install &&\
chown -R sof:sof /home/sof
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_build/sof_builder/docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if [ -f "/etc/apt/apt.conf" ]; then
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 --ulimit nofile=65536:65536 --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sof .