diff options
author | Oliver Smith <osmith@sysmocom.de> | 2019-10-11 09:40:08 +0200 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2019-10-18 10:44:11 +0200 |
commit | 7c987a83b36c05e0cb4fde4c57cb7b0d558e7c88 (patch) | |
tree | 14bfedf7b3271005523027435ba44462b963d17b /docker/rebuild_osmocom_jenkins_image.sh | |
parent | f58d2231a9604080a55328e802881804fe329b5b (diff) |
docker: only one apt/pip cmd for installing deps
Make the retry logic in rebuild_osmocom_jenkins_image.sh obsolete by
merging all apt commands for installing dependencies into one. This
makes development easier, because the docker image will not get rebuilt
again when any error happens (whether that error was related to the apt
cache or not, during development it is mostly not related to the apt
cache).
This also makes it easier to read through the list of dependencies, and
removes duplicate (or even conflicting, pkg-config vs pkgconf) entries.
While at it, also merge the pip commands into one.
Change-Id: I190e62dd39533b284c93107607dac24ece6d7be6
Diffstat (limited to 'docker/rebuild_osmocom_jenkins_image.sh')
-rwxr-xr-x | docker/rebuild_osmocom_jenkins_image.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh index 60c516b..5d14d83 100755 --- a/docker/rebuild_osmocom_jenkins_image.sh +++ b/docker/rebuild_osmocom_jenkins_image.sh @@ -2,12 +2,8 @@ # Executes docker build with the given parameters and retry in case of error. function build_once() { - # In case the debian apt archive has become out of sync, try a - # --no-cache build if it fails. - # shellcheck disable=SC2068 - docker build $@ -f Dockerfile_osmocom_jenkins.amd64 . \ - || docker build --no-cache $@ -f Dockerfile_osmocom_jenkins.amd64 . + docker build $@ -f Dockerfile_osmocom_jenkins.amd64 . } # Builds a container with a debian version and tag name as parameter. |