From bd83865236a1cd5b1694adefee24bc1a6b4f1ec4 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 10 Jan 2019 16:30:57 -0500 Subject: [PATCH] docker: Use a local config for cerbero local_source and home_dir Ohterwise the cerbero.cbc seems to take precendence on the localconf.cbc during builds, which cause caching issues, since data does not get stored at the right place. --- docker/cerbero/Dockerfile-fedora | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/cerbero/Dockerfile-fedora b/docker/cerbero/Dockerfile-fedora index 7f3d3b306b..12df38c383 100644 --- a/docker/cerbero/Dockerfile-fedora +++ b/docker/cerbero/Dockerfile-fedora @@ -13,18 +13,18 @@ RUN git clone https://gitlab.freedesktop.org/gstreamer/cerbero.git && \ mkdir $HOME/.cerbero && \ echo "allow_parallel_build=True" > $HOME/.cerbero/cerbero.cbc && \ echo "use_ccache=True" >> $HOME/.cerbero/cerbero.cbc && \ - echo "local_sources=\"/cerbero/cerbero-sources\"" >> $HOME/.cerbero/cerbero.cbc && \ - echo "home_dir=\"/cerbero/cerbero-build\"" >> $HOME/.cerbero/cerbero.cbc && \ cd cerbero && \ - ./cerbero-uninstalled bootstrap -y --system-only && \ - ./cerbero-uninstalled fetch-bootstrap && \ - ./cerbero-uninstalled fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -c config/cross-win32.cbc fetch-bootstrap && \ - ./cerbero-uninstalled -c config/cross-win32.cbc fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -c config/cross-win32.cbc bootstrap -y --system-only && \ - ./cerbero-uninstalled -c config/cross-win64.cbc fetch-bootstrap && \ - ./cerbero-uninstalled -c config/cross-win64.cbc fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -c config/cross-win64.cbc bootstrap -y --system-only && \ + echo "local_sources=\"/cerbero/cerbero-sources\"" >> localconf.cbc && \ + echo "home_dir=\"/cerbero/cerbero-build\"" >> localconf.cbc && \ + ./cerbero-uninstalled -c localconf.cbc bootstrap -y --system-only && \ + ./cerbero-uninstalled -c localconf.cbc fetch-bootstrap && \ + ./cerbero-uninstalled -c localconf.cbc fetch-package gstreamer-1.0 && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win32.cbc fetch-bootstrap && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win32.cbc fetch-package gstreamer-1.0 && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win32.cbc bootstrap -y --system-only && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win64.cbc fetch-bootstrap && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win64.cbc fetch-package gstreamer-1.0 && \ + ./cerbero-uninstalled -c localconf.cbc -c config/cross-win64.cbc bootstrap -y --system-only && \ cd .. && \ rm /cerbero/cerbero-sources/mingw-w*.tar.xz && \ rm -rf /cerbero/cerbero-build/{dist,logs,sources} && \