diff options
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/cirrus/runner.sh | 7 | ||||
-rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 4 | ||||
-rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 4 | ||||
-rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 4c27dfa4b..899d14c96 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -82,9 +82,16 @@ function _run_bindings() { # shellcheck disable=SC2155 export PATH=$PATH:$GOSRC/hack + # if logformatter sees this, it can link directly to failing source lines + local gitcommit_magic= + if [[ -n "$GIT_COMMIT" ]]; then + gitcommit_magic="/define.gitCommit=${GIT_COMMIT}" + fi + # Subshell needed so logformatter will write output in cwd; if it runs in # the subdir, .cirrus.yml will not find the html'ized log (cd pkg/bindings/test && \ + echo "$gitcommit_magic" && \ ginkgo -progress -trace -noColor -debug -timeout 30m -r -v) |& logformatter } diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index 7950269d2..b0b5bb33b 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -19,11 +19,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman - ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf +RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman + # Note VOLUME options must always happen after the chown call above # RUN commands can not modify existing volumes VOLUME /var/lib/containers diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 03da05806..e7228ea42 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -19,11 +19,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman - ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf +RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman + # Note VOLUME options must always happen after the chown call above # RUN commands can not modify existing volumes VOLUME /var/lib/containers diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 89ec6e39b..864227f89 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -68,11 +68,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman - ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf +RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman + # Note VOLUME options must always happen after the chown call above # RUN commands can not modify existing volumes VOLUME /var/lib/containers |