From 93d7d908266514e18ca5ee23209d6aea8f7e55d7 Mon Sep 17 00:00:00 2001 From: aleajactaest Date: Fri, 18 Aug 2017 01:21:04 +0200 Subject: [PATCH] adding patch squish & update doc to use image builder --- .../builder/debian/jessie/x86_64/Dockerfile | 6 ++--- dist/docker/builder/squish-limit.patch | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 dist/docker/builder/squish-limit.patch diff --git a/dist/docker/builder/debian/jessie/x86_64/Dockerfile b/dist/docker/builder/debian/jessie/x86_64/Dockerfile index e9ccb1fb7..d7d813bdf 100644 --- a/dist/docker/builder/debian/jessie/x86_64/Dockerfile +++ b/dist/docker/builder/debian/jessie/x86_64/Dockerfile @@ -7,13 +7,13 @@ # Created by : AleaJactaEst # to build : -# $ docker build . -t builder_debian_8_adm64 --file dist/docker/builder/debian-8-amd64/Dockerfile +# $ docker build . -t builder_khanat_jessie_x86_64 --file dist/docker/builder/debian-8-amd64/Dockerfile # to use this image : # (on root) -# $ docker run -it --hostname=builder -v $PWD/dist:/opt/dist -v $PWD/code:/opt/code builder_debian_8_adm64 /bin/bash +# $ docker run -it --hostname=builder -v $PWD/dist:/opt/dist -v $PWD/code:/opt/code builder_khanat_jessie_x86_64 /bin/bash # (with your account) -# $ docker run -it --hostname=builder -u "$(id -u $USERNAME):$(id -g $USERNAME)" -v $PWD/dist:/opt/dist -v $PWD/code:/opt/code builder_debian_8_adm64 /bin/bash +# $ docker run -it --hostname=builder -u "$(id -u $USERNAME):$(id -g $USERNAME)" -v $PWD/dist:/opt/dist -v $PWD/code:/opt/code builder_khanat_jessie_x86_64 /bin/bash FROM amd64/debian:8 MAINTAINER AleaJactaEst diff --git a/dist/docker/builder/squish-limit.patch b/dist/docker/builder/squish-limit.patch new file mode 100644 index 000000000..3bdc6c522 --- /dev/null +++ b/dist/docker/builder/squish-limit.patch @@ -0,0 +1,24 @@ +--- alpha.cpp.origin 2017-08-01 15:02:13.627989355 +0000 ++++ alpha.cpp 2017-08-01 15:03:07.591990587 +0000 +@@ -22,7 +22,7 @@ + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + -------------------------------------------------------------------------- */ +- ++#include + #include "alpha.h" + #include + + +--- singlecolourfit.cpp.origin 2017-08-01 15:03:27.175991034 +0000 ++++ singlecolourfit.cpp 2017-08-01 15:03:42.527991384 +0000 +@@ -22,7 +22,7 @@ + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + -------------------------------------------------------------------------- */ +- ++#include + #include "singlecolourfit.h" + #include "colourset.h" + #include "colourblock.h" +