Change in docker-playground[master]: debian-stretch-titan: update deps on change
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change .. debian-stretch-titan: update deps on change After the initial clone of osmo-ttcn3-hacks and deps, let docker download deps/Makefile to invalidate the cache if the file changed. Run "git pull" and "make deps" afterwards, but only if the Makefile is different. The "if" saves time in the initial build of the image, it avoids the "git fetch" on every dependency repository during "make deps". Related: OS#5017 Change-Id: I56673312cfb23375d67900016aaac1931f677275 --- M debian-stretch-titan/Dockerfile 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0f4f17e..39ff76f 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -52,6 +52,12 @@ RUNgit config --global user.email doc...@dock.er && \ git config --global user.name "Dock Er" -# clone osmo-ttcn3-hacks and deps +# clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUNgit clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -C /osmo-ttcn3-hacks deps +ADDhttps://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +RUNif ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make deps; \ + fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: debian-stretch-titan: update deps on change
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change .. Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: update deps on change
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:43:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: update deps on change
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change .. Patch Set 1: Code-Review+1 ah, elgant solution to use the Makefile itself as trigger. I didn't think of that when I wrote the issue. great! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:37:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-titan: update deps on change
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change .. debian-stretch-titan: update deps on change After the initial clone of osmo-ttcn3-hacks and deps, let docker download deps/Makefile to invalidate the cache if the file changed. Run "git pull" and "make deps" afterwards, but only if the Makefile is different. The "if" saves time in the initial build of the image, it avoids the "git fetch" on every dependency repository during "make deps". Related: OS#5017 Change-Id: I56673312cfb23375d67900016aaac1931f677275 --- M debian-stretch-titan/Dockerfile 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/22818/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0f4f17e..39ff76f 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -52,6 +52,12 @@ RUNgit config --global user.email doc...@dock.er && \ git config --global user.name "Dock Er" -# clone osmo-ttcn3-hacks and deps +# clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUNgit clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -C /osmo-ttcn3-hacks deps +ADDhttps://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +RUNif ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make deps; \ + fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
