Skip to content

[skip-ci] Remove proxy setting and upgrade to Ubuntu 20.04 for SOF docker images #4172

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

Jump to bottom
Merged
lgirdwood merged 5 commits into from
May 12, 2021
Merged

[skip-ci] Remove proxy setting and upgrade to Ubuntu 20.04 for SOF docker images #4172

lgirdwood merged 5 commits into from
May 12, 2021

Conversation

@fredoh9
Copy link
Contributor

@fredoh9 fredoh9 commented May 11, 2021

fixes: #3831

@fredoh9 fredoh9 requested a review from kv2019i May 11, 2021 20:06
@fredoh9 fredoh9 mentioned this pull request May 11, 2021
Closed
@fredoh9 fredoh9 changed the title Fix hard-coded proxy settings in SOF docker image [skip-ci] Fix hard-coded proxy settings in SOF docker image May 11, 2021
@fredoh9
Copy link
Contributor Author

fredoh9 commented May 11, 2021

[WIP] sorry, removing /etc/apt/apt.conf has a permission problem. Will resolve this.

@fredoh9 fredoh9 changed the title [skip-ci] Fix hard-coded proxy settings in SOF docker image [skip-ci][WIP] Fix hard-coded proxy settings in SOF docker image May 11, 2021
@fredoh9 fredoh9 force-pushed the fix/docker_proxy branch from abeccec to 750e34f Compare May 12, 2021 01:15
@fredoh9 fredoh9 changed the title [skip-ci][WIP] Fix hard-coded proxy settings in SOF docker image [skip-ci] Fix hard-coded proxy settings in SOF docker image May 12, 2021
@fredoh9
Copy link
Contributor Author

fredoh9 commented May 12, 2021 •
edited
Loading

  1. Removed apt.conf completely. For proxy setting for Intel network, I will update internal wiki page.
  2. Upgrade base Ubuntu image to 20.04

Tested with proxy environment and non-proxy environment.
Docker images are uploaded(pushed) and ready to switch to latest

  • thesofproject/sof:20210511
  • thesofproject/sofqemu:20210511

If I get approval, I will switch to latest for build machines.

marc-hb
marc-hb reviewed May 12, 2021
View reviewed changes
Copy link
Collaborator

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

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

LGTM except -prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu/ is missing a comment or URL

@marc-hb
Copy link
Collaborator

marc-hb commented May 12, 2021

Forgot this sorry: can you please rename this PR? It's far more than proxy settings now.

marc-hb
marc-hb reviewed May 12, 2021
View reviewed changes
@fredoh9 fredoh9 changed the title [skip-ci] Fix hard-coded proxy settings in SOF docker image [skip-ci] Remove proxy setting and upgrade to Ubuntu 20.04 for SOF docker images May 12, 2021
fredoh9 added 3 commits May 11, 2021 23:36
@fredoh9
docker-run.sh: set http/https proxy when docker run
3e369d0 
Use http/https proxys setting from the host.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
@fredoh9
docker-run.sh: minor alignment fix
c17f818 
Removed extra spaces.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
@fredoh9
Dockerfile: add vim and jed to apt install list
852d6c7 
Can't imagine editing files without vim or jed.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
@fredoh9 fredoh9 force-pushed the fix/docker_proxy branch 2 times, most recently from d211a42 to f5ad9e4 Compare May 12, 2021 06:52
@lgirdwood lgirdwood added this to the v1.8 milestone May 12, 2021
marc-hb
marc-hb reviewed May 12, 2021
View reviewed changes
@fredoh9 fredoh9 force-pushed the fix/docker_proxy branch from f5ad9e4 to 91b6173 Compare May 12, 2021 15:57
@marc-hb
Copy link
Collaborator

marc-hb commented May 12, 2021

https://github.com/thesofproject/sof/pull/4172/checks?check_run_id=2568072273 checkpatch found

  • a shell script line too long. No big deal
  • some English typos. No big deal either
  • A spurious SPDX warning because of a known bug in checkpatch when changing the top of the file.
  • A wrong Signed-off-by line. Maybe you want to fix this one (and then the other ones too while at it)

@fredoh9
Copy link
Contributor Author

fredoh9 commented May 12, 2021

@marc-hb good point. Sorry for missing that. Fixing this now

@fredoh9
Dockerfile: remove apt.conf dependency
2aaed67 
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>
@fredoh9
docker: upgrade base ubuntu image to 20.04
03bfb88 
Catching up latest LTS Ubuntu image, 20.04. It is supposed to be minor
upgrade but alsa-lib need to be set default library path,
/usr/lib/x86_64-linux-gnu/. Otherwise topology library loading error
is found for SOF tool build. This is typical error message,

alsatplg: error while loading shared libraries: libatopology.so.2:
cannot open shared object file: No such file or directory.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
@fredoh9 fredoh9 force-pushed the fix/docker_proxy branch from 91b6173 to 03bfb88 Compare May 12, 2021 18:23
@lgirdwood lgirdwood merged commit 5083b2b into thesofproject:main May 12, 2021
@fredoh9 fredoh9 mentioned this pull request May 13, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lgirdwood lgirdwood lgirdwood approved these changes

@marc-hb marc-hb marc-hb approved these changes

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner

@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner

@kv2019i kv2019i Awaiting requested review from kv2019i kv2019i is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v1.8

Development

Successfully merging this pull request may close these issues.

[BUG] SOF docker image has proxy settings hardcoded for Intel network

3 participants

@fredoh9 @marc-hb @lgirdwood