Skip to content
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.

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

[build] Add version files to docker image dependencies #11179

Merged
merged 2 commits into from
Jun 20, 2022

Conversation

liushilongbuaa
Copy link
Contributor

@liushilongbuaa liushilongbuaa commented Jun 17, 2022

Why I did it

Docker image cache need involve package versions.
When we update version dependencies, we need to build new docker image. Loading from old cache may have unmatched dependencies.

How I did it

Add version files to dpkg cache dependency file.

How to verify it

shilongliu@50adfce3534b:/sonic$ make -f slave.mk target/docker-database.gz -p > log
dpkg: error: cannot access archive 'amd64/buildinfo/sonic-build-hooks_*.deb': No such file or directory
cp: cannot stat 'amd64/buildinfo/*': No such file or directory
/bin/bash: line 4: /sonic/target/files/buster/sysctl-net.conf.log: No such file or directory
make: *** [slave.mk:335: target/files/buster/sysctl-net.conf] Error 1

shilongliu@50adfce3534b:/sonic$ grep "docker-database.gz_DEP_FILES " log    
docker-database.gz_DEP_FILES :=  .platform slave.mk rules/functions Makefile.cache rules/docker-database.mk rules/docker-database.dep    sonic-slave-jessie/Dockerfile.j2 sonic-slave-jessie/Dockerfile.user.j2 sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user.j2 sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2 dockers/docker-database/Dockerfile.j2 dockers/docker-database/base_image_files/redis-cli dockers/docker-database/critical_processes dockers/docker-database/database_config.json.j2 dockers/docker-database/database_global.json.j2 dockers/docker-database/docker-database-init.sh dockers/docker-database/flush_unused_database dockers/docker-database/supervisord.conf.j2 files/build/versions/default/versions-git files/build/versions/default/versions-web files/build/versions/default/versions-docker files/build/versions/dockers/docker-database/versions-web files/build/versions/dockers/docker-database/versions-deb-buster

We can see this file: https://artprodcus3.artifacts.visualstudio.com/Af91412a5-a906-4990-9d7c-f697b81fc04d/be1b070f-be15-4154-aade-b1d3bfb17054/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL21zc29uaWMvcHJvamVjdElkL2JlMWIwNzBmLWJlMTUtNDE1NC1hYWRlLWIxZDNiZmIxNzA1NC9idWlsZElkLzExMjMyMC9hcnRpZmFjdE5hbWUvc29uaWMtYnVpbGRpbWFnZS5tYXJ2ZWxsLWFybWhm0/content?format=file&subPath=%2Ftarget%2Fdocker-base-buster.gz.dep

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@liushilongbuaa liushilongbuaa merged commit ad1e20f into sonic-net:master Jun 20, 2022
liushilongbuaa added a commit that referenced this pull request Jun 21, 2022
* [ci] Support to skip vstest using include/exclude config file. (#11086)
* [build] Add version files to docker image dependencies (#11179)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants