From 572ed25bbe61acca852f5ff91769284c747b9494 Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov Date: Tue, 9 Jun 2020 21:14:28 +0300 Subject: [PATCH 1/2] Update documentation on changing the root for docker images --- .../build_krita_with_docker_on_linux.rst | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/untranslatable_pages/build_krita_with_docker_on_linux.rst b/untranslatable_pages/build_krita_with_docker_on_linux.rst index 294161a55e..e60944caf4 100644 --- a/untranslatable_pages/build_krita_with_docker_on_linux.rst +++ b/untranslatable_pages/build_krita_with_docker_on_linux.rst @@ -32,10 +32,33 @@ First make sure you have Docker installed Decide where you want to store your Docker images. All the docker images and containers are by default stored in a special docker-daemon controlled folder under */var* directory. You might not have enough space there for building Krita (it needs about 10 GiB). In such a case it is recommended to move the docker images folder into another location, where there is enough space. -.. code:: +1) Stop docker service + + .. code:: + + sudo systemctl stop docker + +2) Edit the config file: + + On newer systems, like Ubuntu 18.04 and higher you need to open file */etc/docker/daemon.json* and add the following json config options: + + .. code:: + + { + "data-root" : "/path/where/you/want/to/store/docker/images/" + } + + If you have older version of Ubuntu, e.g. Ubuntu 16.04, then you need to do the following: + + .. code:: - # this step is optional - echo 'DOCKER_OPTS="-g /path/where/you/want/to/store/docker/images/"' >> /etc/default/docker + echo 'DOCKER_OPTS="-g /path/where/you/want/to/store/docker/images/"' >> /etc/default/docker + +3) Restart the docker service + + .. code:: + + sudo systemctl start docker Then you need to download deps and Krita source tree. These steps are not included into the *Dockerfile* to save internal bandwidth -- GitLab From d0c6a53d415a88fd5712848104e989787d60df2e Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov Date: Tue, 9 Jun 2020 21:44:33 +0300 Subject: [PATCH 2/2] Fix Krita install path --- untranslatable_pages/build_krita_with_docker_on_linux.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/untranslatable_pages/build_krita_with_docker_on_linux.rst b/untranslatable_pages/build_krita_with_docker_on_linux.rst index e60944caf4..5604075d50 100644 --- a/untranslatable_pages/build_krita_with_docker_on_linux.rst +++ b/untranslatable_pages/build_krita_with_docker_on_linux.rst @@ -110,7 +110,7 @@ Enter the container and build Krita make -j8 install # start Krita - ../appimage-workspace/krita-inst/bin/krita + ../appimage-workspace/krita.appdir/usr/bin/krita Building AppImage package for your version of Krita -- GitLab