osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40260?usp=email )
Change subject: nplab: don't use deprecated git.osmocom.org ......................................................................
nplab: don't use deprecated git.osmocom.org
Update the git clones to point to gitea. With gitea we apparently don't have a way to get the current commit's patch via HTTP, as it was previously done with cgit. This means that the we can't automatically invalidate the cache when rebuilding the container if the commit changed.
However given that we very rarely touch the nplab sources, this should be fine here.
At some future point we could rework this to not clone sources while building the container.
Change-Id: If6859323b5af3bd13a974cd1d676d4f19aa16773 --- M nplab-m3ua-test/Dockerfile M nplab-sua-test/Dockerfile 2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/40260/1
diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile index 9e4f7c4..2b55871 100644 --- a/nplab-m3ua-test/Dockerfile +++ b/nplab-m3ua-test/Dockerfile @@ -1,9 +1,8 @@ ARG USER=osmocom-build FROM $USER/sigtran-tests
- -RUN cd /tmp && git clone https://git.osmocom.org/nplab/m3ua-testtool -ADD http://git.osmocom.org/nplab/m3ua-testtool/patch/?h=laforge/python3 /tmp/commit +# FIXME: cache doesn't get invalidated when commits change +RUN cd /tmp && git clone https://gitea.osmocom.org/nplab/m3ua-testtool RUN cd /tmp/m3ua-testtool && \ git fetch && \ git checkout -f laforge/python3 && \ diff --git a/nplab-sua-test/Dockerfile b/nplab-sua-test/Dockerfile index 5957c26..f82bcdc 100644 --- a/nplab-sua-test/Dockerfile +++ b/nplab-sua-test/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/sigtran-tests
-RUN cd /tmp && git clone https://git.osmocom.org/nplab/sua-testtool -ADD http://git.osmocom.org/nplab/sua-testtool/patch/?h=laforge/python3 /tmp/commit +# FIXME: cache doesn't get invalidated when commits change +RUN cd /tmp && git clone https://gitea.osmocom.org/nplab/sua-testtool RUN cd /tmp/sua-testtool && \ git fetch && \ git checkout -f laforge/python3 && \