From 9051fb418d0355ed9ebd3f6b13acf72af73c8011 Mon Sep 17 00:00:00 2001
From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: Nov 01 2016 23:48:36 +0000
Subject: Reorganize docker files


---

diff --git a/docker-builder-i386/.gitignore b/docker-builder-i386/.gitignore
deleted file mode 100644
index b638cbe..0000000
--- a/docker-builder-i386/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/debian-wheezy-i386.tar.gz
diff --git a/docker-builder-i386/Dockerfile b/docker-builder-i386/Dockerfile
deleted file mode 100644
index 283eeac..0000000
--- a/docker-builder-i386/Dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM my/debian-i386:wheezy
-ARG ALL_PROXY
-
-# Update
-RUN apt-get -yq update
-
-# Upgrade
-RUN apt-get -yq upgrade
-
-# Install tools
-RUN apt-get -yq install \
-    sudo \
-    pkg-config \
-    g++ \
-    make
-
-# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html
-RUN apt-get -yq install \
-    libxrender-dev \
-    libfontconfig1-dev \
-    libfreetype6-dev \
-    libxi-dev \
-    libxext-dev \
-    libx11-dev \
-    libx11-xcb-dev \
-    libsm-dev \
-    libice-dev \
-    libglib2.0-dev \
-    libglu1-mesa-dev
-    
-# other deps
-
-RUN apt-get -yq install liblzma-dev
-RUN apt-get -yq install liblzo2-dev
-RUN apt-get -yq install libudev-dev
-RUN apt-get -yq install libfuse-dev
-RUN apt-get -yq install libdb-dev
-RUN apt-get -yq install libasound2-dev
-
-RUN apt-get -yq install gfortran
-RUN apt-get -yq install csh
-RUN apt-get -yq install xsltproc
-RUN apt-get -yq install m4
-RUN apt-get -yq install automake
-RUN apt-get -yq install intltool
-RUN apt-get -yq install libtool
-
-RUN apt-get -yq install git
-RUN apt-get -yq install wget
-RUN apt-get -yq install bzip2
-
-RUN apt-get -yq install libffi-dev
-RUN apt-get -yq install libmount-dev
-RUN apt-get -yq install libbz2-dev
-RUN apt-get -yq install libdbus-1-dev
-RUN apt-get -yq install libcroco3-dev
-RUN apt-get -yq install flex
-RUN apt-get -yq install bison
-RUN apt-get -yq install python-dev
-RUN apt-get -yq install libxtst-dev
-RUN apt-get -yq install xutils-dev
-RUN apt-get -yq install libegl1-mesa-dev
-RUN apt-get -yq install libdirectfb-dev
-
-RUN mkdir /build
diff --git a/docker-builder-i386/build-base.sh b/docker-builder-i386/build-base.sh
deleted file mode 100755
index 9ce1c8d..0000000
--- a/docker-builder-i386/build-base.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-arch=i386
-suite=wheezy
-docker_image="my/debian-$arch:$suite"
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-
-if [ -f debian-$suite-$arch.tar.gz ]; then
-    docker import - $docker_image < debian-$suite-$arch.tar.gz
-else
-    echo "File debian-$suite-$arch.tar.gz not found"
-    echo "You may try to create it by command ./build-tgz.sh"
-    echo "or download it from http://icystar.com/downloads/debian-wheezy-i386.tar.gz"
-fi
diff --git a/docker-builder-i386/build-tgz.sh b/docker-builder-i386/build-tgz.sh
deleted file mode 100755
index edcfe71..0000000
--- a/docker-builder-i386/build-tgz.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-arch=i386
-suite=wheezy
-chroot_dir="/var/chroot/$suite"
-apt_mirror="ftp://ftp.debian.org/debian/"
-
-export DEBIAN_FRONTEND=noninteractive
-debootstrap --arch $arch $suite $chroot_dir $apt_mirror
-
-cat <<EOF > $chroot_dir/etc/apt/sources.list
-deb $apt_mirror $suite main
-deb $apt_mirror $suite-updates main
-deb http://security.debian.org/ $suite/updates main
-EOF
-
-chroot $chroot_dir apt-get update
-chroot $chroot_dir apt-get upgrade -y
-chroot $chroot_dir apt-get autoclean
-chroot $chroot_dir apt-get clean
-chroot $chroot_dir apt-get autoremove
-
-tar cfz debian-$suite-$arch.tar.gz -C $chroot_dir .
-rm -rf $chroot_dir
diff --git a/docker-builder-i386/build.sh b/docker-builder-i386/build.sh
deleted file mode 100755
index d088a29..0000000
--- a/docker-builder-i386/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-export PACKET_BUILD_DIR
-mkdir -p $PACKET_BUILD_DIR
-
-docker build -t my/builder-i386 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR"
diff --git a/docker-builder-i386/run.sh b/docker-builder-i386/run.sh
deleted file mode 100755
index 67fb260..0000000
--- a/docker-builder-i386/run.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-DATA_DIR="$BASE_DIR/docker-builder-data"
-
-BUILD_DIR=$DATA_DIR/build
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-export PACKET_BUILD_DIR
-mkdir -p $PACKET_BUILD_DIR
-
-docker stop "builder-i386" || true
-docker rm "builder-i386" || true
-
-docker run -it \
-    --name "builder-i386" \
-    $DOCKER_RUN_OPTIONS \
-    --privileged=true \
-    -v "$PACKET_BUILD_DIR:/build/packet" \
-    -v "$SCRIPT_BUILD_DIR:/build/script" \
-    -e PLATFORM=linux-i386 \
-    my/builder-i386 \
-    setarch i686 /build/script/common/manager.sh "$@"
-
diff --git a/docker-builder/.gitignore b/docker-builder/.gitignore
deleted file mode 100644
index f9d29e1..0000000
--- a/docker-builder/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/debian-wheezy-amd64.tar.gz
diff --git a/docker-builder/Dockerfile b/docker-builder/Dockerfile
deleted file mode 100644
index d8da353..0000000
--- a/docker-builder/Dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM debian:7
-ARG ALL_PROXY
-
-# Update
-RUN apt-get -yq update
-
-# Upgrade
-RUN apt-get -yq upgrade
-
-# Install tools
-RUN apt-get -yq install \
-    sudo \
-    pkg-config \
-    g++ \
-    make
-
-# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html
-RUN apt-get -yq install \
-    libxrender-dev \
-    libfontconfig1-dev \
-    libfreetype6-dev \
-    libxi-dev \
-    libxext-dev \
-    libx11-dev \
-    libx11-xcb-dev \
-    libsm-dev \
-    libice-dev \
-    libglib2.0-dev \
-    libglu1-mesa-dev
-    
-# other deps
-
-RUN apt-get -yq install liblzma-dev
-RUN apt-get -yq install liblzo2-dev
-RUN apt-get -yq install libudev-dev
-RUN apt-get -yq install libfuse-dev
-RUN apt-get -yq install libdb-dev
-RUN apt-get -yq install libasound2-dev
-
-RUN apt-get -yq install gfortran
-RUN apt-get -yq install csh
-RUN apt-get -yq install xsltproc
-RUN apt-get -yq install m4
-RUN apt-get -yq install automake
-RUN apt-get -yq install intltool
-RUN apt-get -yq install libtool
-
-RUN apt-get -yq install git
-RUN apt-get -yq install wget
-RUN apt-get -yq install bzip2
-
-RUN apt-get -yq install libffi-dev
-RUN apt-get -yq install libmount-dev
-RUN apt-get -yq install libbz2-dev
-RUN apt-get -yq install libdbus-1-dev
-RUN apt-get -yq install libcroco3-dev
-RUN apt-get -yq install flex
-RUN apt-get -yq install bison
-RUN apt-get -yq install python-dev
-RUN apt-get -yq install libxtst-dev
-RUN apt-get -yq install xutils-dev
-RUN apt-get -yq install libegl1-mesa-dev
-RUN apt-get -yq install libdirectfb-dev
-
-RUN mkdir /build
diff --git a/docker-builder/build-base.sh b/docker-builder/build-base.sh
deleted file mode 100755
index 008f91a..0000000
--- a/docker-builder/build-base.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-arch=amd64
-suite=wheezy
-docker_image="debian:7"
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-
-if [ -f debian-$suite-$arch.tar.gz ]; then
-    docker import - $docker_image < debian-$suite-$arch.tar.gz
-else
-    echo "File debian-$suite-$arch.tar.gz not found"
-    echo "You may try to create it by command ./build-tgz.sh"
-    echo "or download it from http://icystar.com/downloads/debian-wheezy-i386.tar.gz"
-fi
diff --git a/docker-builder/build-tgz.sh b/docker-builder/build-tgz.sh
deleted file mode 100755
index a42455f..0000000
--- a/docker-builder/build-tgz.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-arch=amd64
-suite=wheezy
-chroot_dir="/var/chroot/$suite"
-apt_mirror="ftp://ftp.debian.org/debian/"
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-
-rm -rf $chroot_dir
-export DEBIAN_FRONTEND=noninteractive
-debootstrap --arch $arch $suite $chroot_dir $apt_mirror
-
-cat <<EOF > $chroot_dir/etc/apt/sources.list
-deb $apt_mirror $suite main
-deb $apt_mirror $suite-updates main
-deb http://security.debian.org/ $suite/updates main
-EOF
-
-chroot $chroot_dir apt-get update
-chroot $chroot_dir apt-get upgrade -y
-chroot $chroot_dir apt-get autoclean
-chroot $chroot_dir apt-get clean
-chroot $chroot_dir apt-get autoremove
-
-tar cfz debian-$suite-$arch.tar.gz -C $chroot_dir .
-rm -rf $chroot_dir
diff --git a/docker-builder/build.sh b/docker-builder/build.sh
deleted file mode 100755
index ff7c574..0000000
--- a/docker-builder/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-export PACKET_BUILD_DIR
-mkdir -p $PACKET_BUILD_DIR
-
-docker build -t my/builder $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR"
diff --git a/docker-builder/run.sh b/docker-builder/run.sh
deleted file mode 100755
index e976d64..0000000
--- a/docker-builder/run.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-OLDDIR=`pwd`
-SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-BASE_DIR=`dirname "$SCRIPT_DIR"`
-DATA_DIR="$BASE_DIR/docker-builder-data"
-
-BUILD_DIR=$DATA_DIR/build
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-export PACKET_BUILD_DIR
-mkdir -p $PACKET_BUILD_DIR
-
-docker stop "builder" || true
-docker rm "builder" || true
-
-docker run -it \
-    --name "builder" \
-    --privileged=true \
-    $DOCKER_RUN_OPTIONS \
-    -v "$PACKET_BUILD_DIR:/build/packet" \
-    -v "$SCRIPT_BUILD_DIR:/build/script" \
-    my/builder \
-    /build/script/common/manager.sh "$@"
-
diff --git a/docker/debian-7-32bit/.gitignore b/docker/debian-7-32bit/.gitignore
new file mode 100644
index 0000000..b638cbe
--- /dev/null
+++ b/docker/debian-7-32bit/.gitignore
@@ -0,0 +1 @@
+/debian-wheezy-i386.tar.gz
diff --git a/docker/debian-7-32bit/Dockerfile b/docker/debian-7-32bit/Dockerfile
new file mode 100644
index 0000000..283eeac
--- /dev/null
+++ b/docker/debian-7-32bit/Dockerfile
@@ -0,0 +1,65 @@
+FROM my/debian-i386:wheezy
+ARG ALL_PROXY
+
+# Update
+RUN apt-get -yq update
+
+# Upgrade
+RUN apt-get -yq upgrade
+
+# Install tools
+RUN apt-get -yq install \
+    sudo \
+    pkg-config \
+    g++ \
+    make
+
+# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html
+RUN apt-get -yq install \
+    libxrender-dev \
+    libfontconfig1-dev \
+    libfreetype6-dev \
+    libxi-dev \
+    libxext-dev \
+    libx11-dev \
+    libx11-xcb-dev \
+    libsm-dev \
+    libice-dev \
+    libglib2.0-dev \
+    libglu1-mesa-dev
+    
+# other deps
+
+RUN apt-get -yq install liblzma-dev
+RUN apt-get -yq install liblzo2-dev
+RUN apt-get -yq install libudev-dev
+RUN apt-get -yq install libfuse-dev
+RUN apt-get -yq install libdb-dev
+RUN apt-get -yq install libasound2-dev
+
+RUN apt-get -yq install gfortran
+RUN apt-get -yq install csh
+RUN apt-get -yq install xsltproc
+RUN apt-get -yq install m4
+RUN apt-get -yq install automake
+RUN apt-get -yq install intltool
+RUN apt-get -yq install libtool
+
+RUN apt-get -yq install git
+RUN apt-get -yq install wget
+RUN apt-get -yq install bzip2
+
+RUN apt-get -yq install libffi-dev
+RUN apt-get -yq install libmount-dev
+RUN apt-get -yq install libbz2-dev
+RUN apt-get -yq install libdbus-1-dev
+RUN apt-get -yq install libcroco3-dev
+RUN apt-get -yq install flex
+RUN apt-get -yq install bison
+RUN apt-get -yq install python-dev
+RUN apt-get -yq install libxtst-dev
+RUN apt-get -yq install xutils-dev
+RUN apt-get -yq install libegl1-mesa-dev
+RUN apt-get -yq install libdirectfb-dev
+
+RUN mkdir /build
diff --git a/docker/debian-7-32bit/build-base.sh b/docker/debian-7-32bit/build-base.sh
new file mode 100755
index 0000000..9ce1c8d
--- /dev/null
+++ b/docker/debian-7-32bit/build-base.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -x
+
+set -e
+
+arch=i386
+suite=wheezy
+docker_image="my/debian-$arch:$suite"
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+
+
+if [ -f debian-$suite-$arch.tar.gz ]; then
+    docker import - $docker_image < debian-$suite-$arch.tar.gz
+else
+    echo "File debian-$suite-$arch.tar.gz not found"
+    echo "You may try to create it by command ./build-tgz.sh"
+    echo "or download it from http://icystar.com/downloads/debian-wheezy-i386.tar.gz"
+fi
diff --git a/docker/debian-7-32bit/build-tgz.sh b/docker/debian-7-32bit/build-tgz.sh
new file mode 100755
index 0000000..edcfe71
--- /dev/null
+++ b/docker/debian-7-32bit/build-tgz.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -x
+
+set -e
+
+arch=i386
+suite=wheezy
+chroot_dir="/var/chroot/$suite"
+apt_mirror="ftp://ftp.debian.org/debian/"
+
+export DEBIAN_FRONTEND=noninteractive
+debootstrap --arch $arch $suite $chroot_dir $apt_mirror
+
+cat <<EOF > $chroot_dir/etc/apt/sources.list
+deb $apt_mirror $suite main
+deb $apt_mirror $suite-updates main
+deb http://security.debian.org/ $suite/updates main
+EOF
+
+chroot $chroot_dir apt-get update
+chroot $chroot_dir apt-get upgrade -y
+chroot $chroot_dir apt-get autoclean
+chroot $chroot_dir apt-get clean
+chroot $chroot_dir apt-get autoremove
+
+tar cfz debian-$suite-$arch.tar.gz -C $chroot_dir .
+rm -rf $chroot_dir
diff --git a/docker/debian-7-32bit/build.sh b/docker/debian-7-32bit/build.sh
new file mode 100755
index 0000000..d088a29
--- /dev/null
+++ b/docker/debian-7-32bit/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+export PACKET_BUILD_DIR
+mkdir -p $PACKET_BUILD_DIR
+
+docker build -t my/builder-i386 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR"
diff --git a/docker/debian-7-32bit/run.sh b/docker/debian-7-32bit/run.sh
new file mode 100755
index 0000000..67fb260
--- /dev/null
+++ b/docker/debian-7-32bit/run.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+DATA_DIR="$BASE_DIR/docker-builder-data"
+
+BUILD_DIR=$DATA_DIR/build
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+export PACKET_BUILD_DIR
+mkdir -p $PACKET_BUILD_DIR
+
+docker stop "builder-i386" || true
+docker rm "builder-i386" || true
+
+docker run -it \
+    --name "builder-i386" \
+    $DOCKER_RUN_OPTIONS \
+    --privileged=true \
+    -v "$PACKET_BUILD_DIR:/build/packet" \
+    -v "$SCRIPT_BUILD_DIR:/build/script" \
+    -e PLATFORM=linux-i386 \
+    my/builder-i386 \
+    setarch i686 /build/script/common/manager.sh "$@"
+
diff --git a/docker/debian-7-64bit/.gitignore b/docker/debian-7-64bit/.gitignore
new file mode 100644
index 0000000..f9d29e1
--- /dev/null
+++ b/docker/debian-7-64bit/.gitignore
@@ -0,0 +1 @@
+/debian-wheezy-amd64.tar.gz
diff --git a/docker/debian-7-64bit/Dockerfile b/docker/debian-7-64bit/Dockerfile
new file mode 100644
index 0000000..d8da353
--- /dev/null
+++ b/docker/debian-7-64bit/Dockerfile
@@ -0,0 +1,65 @@
+FROM debian:7
+ARG ALL_PROXY
+
+# Update
+RUN apt-get -yq update
+
+# Upgrade
+RUN apt-get -yq upgrade
+
+# Install tools
+RUN apt-get -yq install \
+    sudo \
+    pkg-config \
+    g++ \
+    make
+
+# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html
+RUN apt-get -yq install \
+    libxrender-dev \
+    libfontconfig1-dev \
+    libfreetype6-dev \
+    libxi-dev \
+    libxext-dev \
+    libx11-dev \
+    libx11-xcb-dev \
+    libsm-dev \
+    libice-dev \
+    libglib2.0-dev \
+    libglu1-mesa-dev
+    
+# other deps
+
+RUN apt-get -yq install liblzma-dev
+RUN apt-get -yq install liblzo2-dev
+RUN apt-get -yq install libudev-dev
+RUN apt-get -yq install libfuse-dev
+RUN apt-get -yq install libdb-dev
+RUN apt-get -yq install libasound2-dev
+
+RUN apt-get -yq install gfortran
+RUN apt-get -yq install csh
+RUN apt-get -yq install xsltproc
+RUN apt-get -yq install m4
+RUN apt-get -yq install automake
+RUN apt-get -yq install intltool
+RUN apt-get -yq install libtool
+
+RUN apt-get -yq install git
+RUN apt-get -yq install wget
+RUN apt-get -yq install bzip2
+
+RUN apt-get -yq install libffi-dev
+RUN apt-get -yq install libmount-dev
+RUN apt-get -yq install libbz2-dev
+RUN apt-get -yq install libdbus-1-dev
+RUN apt-get -yq install libcroco3-dev
+RUN apt-get -yq install flex
+RUN apt-get -yq install bison
+RUN apt-get -yq install python-dev
+RUN apt-get -yq install libxtst-dev
+RUN apt-get -yq install xutils-dev
+RUN apt-get -yq install libegl1-mesa-dev
+RUN apt-get -yq install libdirectfb-dev
+
+RUN mkdir /build
diff --git a/docker/debian-7-64bit/build-base.sh b/docker/debian-7-64bit/build-base.sh
new file mode 100755
index 0000000..008f91a
--- /dev/null
+++ b/docker/debian-7-64bit/build-base.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -x
+
+set -e
+
+arch=amd64
+suite=wheezy
+docker_image="debian:7"
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+
+
+if [ -f debian-$suite-$arch.tar.gz ]; then
+    docker import - $docker_image < debian-$suite-$arch.tar.gz
+else
+    echo "File debian-$suite-$arch.tar.gz not found"
+    echo "You may try to create it by command ./build-tgz.sh"
+    echo "or download it from http://icystar.com/downloads/debian-wheezy-i386.tar.gz"
+fi
diff --git a/docker/debian-7-64bit/build-tgz.sh b/docker/debian-7-64bit/build-tgz.sh
new file mode 100755
index 0000000..a42455f
--- /dev/null
+++ b/docker/debian-7-64bit/build-tgz.sh
@@ -0,0 +1,38 @@
+#!/bin/bash -x
+
+set -e
+
+arch=amd64
+suite=wheezy
+chroot_dir="/var/chroot/$suite"
+apt_mirror="ftp://ftp.debian.org/debian/"
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+
+
+rm -rf $chroot_dir
+export DEBIAN_FRONTEND=noninteractive
+debootstrap --arch $arch $suite $chroot_dir $apt_mirror
+
+cat <<EOF > $chroot_dir/etc/apt/sources.list
+deb $apt_mirror $suite main
+deb $apt_mirror $suite-updates main
+deb http://security.debian.org/ $suite/updates main
+EOF
+
+chroot $chroot_dir apt-get update
+chroot $chroot_dir apt-get upgrade -y
+chroot $chroot_dir apt-get autoclean
+chroot $chroot_dir apt-get clean
+chroot $chroot_dir apt-get autoremove
+
+tar cfz debian-$suite-$arch.tar.gz -C $chroot_dir .
+rm -rf $chroot_dir
diff --git a/docker/debian-7-64bit/build.sh b/docker/debian-7-64bit/build.sh
new file mode 100755
index 0000000..ff7c574
--- /dev/null
+++ b/docker/debian-7-64bit/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+export PACKET_BUILD_DIR
+mkdir -p $PACKET_BUILD_DIR
+
+docker build -t my/builder $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR"
diff --git a/docker/debian-7-64bit/run.sh b/docker/debian-7-64bit/run.sh
new file mode 100755
index 0000000..e976d64
--- /dev/null
+++ b/docker/debian-7-64bit/run.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+OLDDIR=`pwd`
+SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
+cd "$OLDDIR"
+BASE_DIR=`dirname "$SCRIPT_DIR"`
+DATA_DIR="$BASE_DIR/docker-builder-data"
+
+BUILD_DIR=$DATA_DIR/build
+
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+export PACKET_BUILD_DIR
+mkdir -p $PACKET_BUILD_DIR
+
+docker stop "builder" || true
+docker rm "builder" || true
+
+docker run -it \
+    --name "builder" \
+    --privileged=true \
+    $DOCKER_RUN_OPTIONS \
+    -v "$PACKET_BUILD_DIR:/build/packet" \
+    -v "$SCRIPT_BUILD_DIR:/build/script" \
+    my/builder \
+    /build/script/common/manager.sh "$@"
+
diff --git a/publish/update-opentoonz.sh b/publish/update-opentoonz.sh
index 57f23ec..c0a2d6c 100755
--- a/publish/update-opentoonz.sh
+++ b/publish/update-opentoonz.sh
@@ -49,6 +49,9 @@ run() {
 		echo "Version $VERSION-$COMMIT-$PLATFORM_SUFFIX already published"
 	fi
 }
-
-run "$BASE_DIR/docker-builder/run.sh" "linux-x64" "64bits"
-run "$BASE_DIR/docker-builder-i386/run.sh" "linux-i386" "32bits"
+if [ -z "$1" ] || [ -z "$2" ]; then
+run "$BASE_DIR/docker/debian-7-64bit/run.sh" "linux-x64" "64bit"
+run "$BASE_DIR/docker/debian-7-32bit/run.sh" "linux-i386" "32bit"
+else
+run "$BASE_DIR/docker/debian-7-$2/run.sh" "$1" "$2"
+fi
diff --git a/publish/update-synfigstudio.sh b/publish/update-synfigstudio.sh
index 4853ecc..c59f9dc 100755
--- a/publish/update-synfigstudio.sh
+++ b/publish/update-synfigstudio.sh
@@ -52,5 +52,9 @@ if ! ls $PUBLISH_DIR/SynfigStudio-$VERSION-*-$COMMIT-$PLATFORM_SUFFIX.appimage 1
 	fi
 }
 
-run "$BASE_DIR/docker-builder/run.sh" "linux-x64" "64bits"
-run "$BASE_DIR/docker-builder-i386/run.sh" "linux-i386" "32bits"
+if [ -z "$1" ] || [ -z "$2" ]; then
+run "$BASE_DIR/docker/debian-7-64bit/run.sh" "linux-x64" "64bits"
+run "$BASE_DIR/docker/debian-7-32bit/run.sh" "linux-i386" "32bits"
+else
+run "$BASE_DIR/docker-builder/run.sh" "$1" "$2"
+fi