adding patch squish & update doc to use image builder

This commit is contained in:
aleajactaest 2017-08-18 01:21:04 +02:00
parent 9485a8e519
commit 93d7d90826
2 changed files with 27 additions and 3 deletions

View file

@ -7,13 +7,13 @@
# Created by : AleaJactaEst # Created by : AleaJactaEst
# to build : # 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 : # to use this image :
# (on root) # (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) # (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 FROM amd64/debian:8
MAINTAINER AleaJactaEst MAINTAINER AleaJactaEst

24
dist/docker/builder/squish-limit.patch vendored Normal file
View file

@ -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 <limits.h>
#include "alpha.h"
#include <algorithm>
--- 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 <limits.h>
#include "singlecolourfit.h"
#include "colourset.h"
#include "colourblock.h"