diff --git a/docker-builder-data/build/script/include/inc-pkdownload-default.sh b/docker-builder-data/build/script/include/inc-pkdownload-default.sh index c658a92..63f6a26 100644 --- a/docker-builder-data/build/script/include/inc-pkdownload-default.sh +++ b/docker-builder-data/build/script/include/inc-pkdownload-default.sh @@ -3,7 +3,7 @@ # PK_ARCHIVE pkdownload() { - if ! wget -c --no-check-certificate "$PK_URL" -O "$PK_ARCHIVE"; then + if ! wget -c "$PK_URL" -O "$PK_ARCHIVE"; then return 1 fi } diff --git a/docker/debian-7-32bit/Dockerfile b/docker/debian-7-32bit/Dockerfile index bfc321e..634772a 100644 --- a/docker/debian-7-32bit/Dockerfile +++ b/docker/debian-7-32bit/Dockerfile @@ -10,8 +10,12 @@ RUN apt-get -yq update # upgrade RUN apt-get -yq upgrade +# update ca-certificates +RUN apt-get -yq purge ca-certificates +RUN apt-get -yq install ca-certificates + # install tools -RUN apt-get -yq install bash sudo pkg-config g++ make wget +RUN apt-get -yq install bash sudo pkg-config g++ make wget bzip2 # upgrade gcc RUN apt-get -yq install libgmp-dev libmpfr-dev libmpc-dev gcc-multilib @@ -26,7 +30,6 @@ 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 bzip2 # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html RUN apt-get -yq install libxrender-dev diff --git a/docker/debian-7-32bit/files/install-gcc.sh b/docker/debian-7-32bit/files/install-gcc.sh index e494d8b..c546091 100755 --- a/docker/debian-7-32bit/files/install-gcc.sh +++ b/docker/debian-7-32bit/files/install-gcc.sh @@ -7,7 +7,7 @@ cd install-gcc echo && echo "download and unpack" && echo -GCC_SOURCES_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz" +GCC_SOURCES_URL="https://ftp.gnu.org/gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz" wget -c "$GCC_SOURCES_URL" tar -xf gcc-*.tar.* diff --git a/docker/debian-7-32bit/files/sources.list b/docker/debian-7-32bit/files/sources.list index e97897c..72b2518 100644 --- a/docker/debian-7-32bit/files/sources.list +++ b/docker/debian-7-32bit/files/sources.list @@ -1,3 +1,3 @@ -deb ftp://ftp.de.debian.org/debian/ wheezy main -deb ftp://ftp.de.debian.org/debian/ wheezy-updates main +deb http://ftp.de.debian.org/debian/ wheezy main +deb http://ftp.de.debian.org/debian/ wheezy-updates main deb http://security.debian.org/ wheezy/updates main diff --git a/docker/debian-7-64bit/Dockerfile b/docker/debian-7-64bit/Dockerfile index cd2ced9..7680806 100644 --- a/docker/debian-7-64bit/Dockerfile +++ b/docker/debian-7-64bit/Dockerfile @@ -10,14 +10,22 @@ RUN apt-get -yq update # upgrade RUN apt-get -yq upgrade +# update ca-certificates +RUN apt-get -yq purge ca-certificates +RUN apt-get -yq install ca-certificates + # install tools -RUN apt-get -yq install bash sudo pkg-config g++ make wget +RUN apt-get -yq install bash sudo pkg-config g++ make wget bzip2 # upgrade gcc RUN apt-get -yq install libgmp-dev libmpfr-dev libmpc-dev gcc-multilib COPY files/install-gcc.sh / RUN /install-gcc.sh +# install mingw +COPY files/install-mingw.sh / +RUN /install-mingw.sh + # install tools RUN apt-get -yq install csh RUN apt-get -yq install xsltproc @@ -26,7 +34,6 @@ 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 bzip2 # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html RUN apt-get -yq install libxrender-dev diff --git a/docker/debian-7-64bit/files/install-gcc.sh b/docker/debian-7-64bit/files/install-gcc.sh index e494d8b..c546091 100755 --- a/docker/debian-7-64bit/files/install-gcc.sh +++ b/docker/debian-7-64bit/files/install-gcc.sh @@ -7,7 +7,7 @@ cd install-gcc echo && echo "download and unpack" && echo -GCC_SOURCES_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz" +GCC_SOURCES_URL="https://ftp.gnu.org/gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz" wget -c "$GCC_SOURCES_URL" tar -xf gcc-*.tar.* diff --git a/docker/debian-7-64bit/files/install-mingw.sh b/docker/debian-7-64bit/files/install-mingw.sh new file mode 100755 index 0000000..e9561c2 --- /dev/null +++ b/docker/debian-7-64bit/files/install-mingw.sh @@ -0,0 +1,327 @@ +#!/bin/bash + +set -e + +VER_BINUTILS="2.29.1" +DIR_BINUTILS="binutils-$VER_BINUTILS" +ARH_BINUTILS="$DIR_BINUTILS.tar.xz" +URL_BINUTILS="https://ftp.gnu.org/gnu/binutils/$ARH_BINUTILS" + +VER_GCC="7.2.0" +DIR_GCC="gcc-$VER_GCC" +ARH_GCC="$DIR_GCC.tar.xz" +URL_GCC="https://ftp.gnu.org/gnu/gcc/gcc-$VER_GCC/$ARH_GCC" + +VER_MINGW="5.0.3" +DIR_MINGW="mingw-w64-v$VER_MINGW" +ARH_MINGW="$DIR_MINGW.tar.bz2" +URL_MINGW="https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/$ARH_MINGW" + +VER_ICONV="1.15" +DIR_ICONV="libiconv-$VER_ICONV" +ARH_ICONV="$DIR_ICONV.tar.gz" +URL_ICONV="https://ftp.gnu.org/pub/gnu/libiconv/$ARH_ICONV" + +VER_GETTEXT="0.19.7" +DIR_GETTEXT="gettext-$VER_GETTEXT" +ARH_GETTEXT="$DIR_GETTEXT.tar.gz" +URL_GETTEXT="https://ftp.gnu.org/pub/gnu/gettext/$ARH_GETTEXT" + + +THREADS=`nproc` +INITIAL_PATH="$PATH" +COMMAND="$0" + + +if [ "$1" == "host_install" ]; then + PATH="/usr/local/$2/sys-root/bin:$PATH" make install + exit +fi + + +download() { + mkdir -p "install-mingw/download" + cd "install-mingw/download" + if [ ! -f "done" ]; then + echo && echo "download" && echo + + wget -c --no-cookies --max-redirect 40 "$URL_BINUTILS" + wget -c --no-cookies --max-redirect 40 "$URL_GCC" + wget -c --no-cookies --max-redirect 40 "$URL_MINGW" + wget -c --no-cookies --max-redirect 40 "$URL_ICONV" + wget -c --no-cookies --max-redirect 40 "$URL_GETTEXT" + + tar -xf "../download/$ARH_BINUTILS" + tar -xf "../download/$ARH_GCC" + tar -xf "../download/$ARH_MINGW" + tar -xf "../download/$ARH_ICONV" + tar -xf "../download/$ARH_GETTEXT" + + touch "done" + fi + cd ../.. +} + +install_binutils() { + local ARCH="$1" + mkdir -p "install-mingw/build/binutils-$ARCH" + cd "install-mingw/build/binutils-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install binutils $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_BINUTILS/configure" \ + --target="$ARCH" \ + --disable-multilib \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo make install + touch "done" + fi + cd ../../.. +} + +install_headers() { + local ARCH="$1" + mkdir -p "install-mingw/build/headers-$ARCH" + cd "install-mingw/build/headers-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install headers $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_MINGW/mingw-w64-headers/configure" \ + --host="$ARCH" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo make install + pushd "/usr/local/$ARCH/sys-root" + sudo ln -s . mingw + popd + touch "done" + fi + cd ../../.. +} + +install_gcc() { + local ARCH="$1" + mkdir -p "install-mingw/build/gcc-$ARCH" + cd "install-mingw/build/gcc-$ARCH" + if [ ! -f "gcc.done" ]; then + echo && echo "install gcc $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_GCC/configure" \ + --target="$ARCH" \ + --disable-multilib \ + --enable-shared \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS all-gcc || make + sudo make install-gcc + touch "gcc.done" + fi + cd ../../.. +} + +install_crt() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/crt-$ARCH" + cd "install-mingw/build/crt-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install crt $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_MINGW/mingw-w64-crt/configure" \ + --host="$ARCH" \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +finish_gcc() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/gcc-$ARCH" + cd "install-mingw/build/gcc-$ARCH" + if [ ! -f "done" ]; then + echo && echo "finish gcc $ARCH" && echo + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +install_libmangle() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/libmangle-$ARCH" + cd "install-mingw/build/libmangle-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install libmangle $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_MINGW/configure" \ + --host="$ARCH" \ + --without-headers \ + --without-crt \ + --with-libraries=libmangle \ + --with-tools=no \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +install_libs() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/libs-$ARCH" + cd "install-mingw/build/libs-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install libs $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_MINGW/configure" \ + --host="$ARCH" \ + --without-headers \ + --without-crt \ + --with-libraries=winpthreads \ + --with-tools=all \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +install_iconv() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/iconv-$ARCH" + cd "install-mingw/build/iconv-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install iconv $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_ICONV/configure" \ + --host="$ARCH" \ + --enable-static \ + --enable-shared \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +install_gettext() { + local ARCH="$1" + export PATH="/usr/local/$ARCH/sys-root/bin:$INITIAL_PATH" + mkdir -p "install-mingw/build/gettext-$ARCH" + cd "install-mingw/build/gettext-$ARCH" + if [ ! -f "done" ]; then + echo && echo "install gettext $ARCH" && echo + if [ ! -f "configure.done" ]; then + "../../download/$DIR_GETTEXT/configure" \ + --host="$ARCH" \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --enable-static \ + --enable-shared \ + --enable-threads=win32 \ + --without-emacs \ + --disable-openmp \ + --with-sysroot="/usr/local/$ARCH/sys-root" \ + --prefix="/usr/local/$ARCH/sys-root" + touch "configure.done" + fi + make -j$THREADS || make + sudo "../../../$0" host_install "$ARCH" + touch "done" + fi + cd ../../.. +} + +install_license() { + local NAME="$1" + local DIR_NAME="$2" + cd "install-mingw/download/$DIR_NAME" + if [ ! -f "../../build/$NAME.license.done" ]; then + echo && echo "install license $NAME" && echo + local TARGET="../../build/$NAME.license" + echo > "$TARGET" + for FILE in README COPYING* MAINTAINERS AUTHORS; do + if [ -f "$FILE" ]; then + echo "" >> "$TARGET" + echo "-------------------------------------" >> "$TARGET" + echo " File: $FILE" >> "$TARGET" + echo "-------------------------------------" >> "$TARGET" + echo "" >> "$TARGET" + cat "$FILE" >> "$TARGET" + fi + done + sudo mkdir -p "/usr/local/share/doc/$NAME" + sudo cp "$TARGET" "/usr/local/share/doc/$NAME/copyright" + touch "../../build/$NAME.license.done" + fi + cd ../../.. +} + + +install() { + local ARCH="$1" + install_binutils "$ARCH" + install_headers "$ARCH" + install_gcc "$ARCH" + install_crt "$ARCH" + finish_gcc "$ARCH" + install_libmangle "$ARCH" + install_libs "$ARCH" + install_iconv "$ARCH" + install_gettext "$ARCH" + + install_license gcc "$DIR_GCC" + install_license g++ "$DIR_GCC" + install_license gfortran "$DIR_GCC" + install_license cc "$DIR_GCC" + install_license c++ "$DIR_GCC" + install_license gfortran "$DIR_GCC" + + install_license mingw-w64 "$DIR_MINGW" + install_license iconv "$DIR_ICONV" + install_license gettext "$DIR_GETTEXT" +} + +clean() { + echo && echo "clean" && echo + rm -r install-mingw +} + +download +install x86_64-w64-mingw32 +install i686-w64-mingw32 +clean + +echo && echo "done" && echo diff --git a/docker/debian-7-64bit/files/sources.list b/docker/debian-7-64bit/files/sources.list index e97897c..72b2518 100644 --- a/docker/debian-7-64bit/files/sources.list +++ b/docker/debian-7-64bit/files/sources.list @@ -1,3 +1,3 @@ -deb ftp://ftp.de.debian.org/debian/ wheezy main -deb ftp://ftp.de.debian.org/debian/ wheezy-updates main +deb http://ftp.de.debian.org/debian/ wheezy main +deb http://ftp.de.debian.org/debian/ wheezy-updates main deb http://security.debian.org/ wheezy/updates main diff --git a/docker/debian-7-64bit/win32.sh b/docker/debian-7-64bit/win32.sh new file mode 100755 index 0000000..dba1c03 --- /dev/null +++ b/docker/debian-7-64bit/win32.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +PLATFORM=win ARCH=32 $(cd `dirname "$0"`; pwd)/run.sh "$@" diff --git a/docker/debian-7-64bit/win64.sh b/docker/debian-7-64bit/win64.sh new file mode 100755 index 0000000..dba1c03 --- /dev/null +++ b/docker/debian-7-64bit/win64.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +PLATFORM=win ARCH=32 $(cd `dirname "$0"`; pwd)/run.sh "$@" diff --git a/docker/fedora-cross-win/Dockerfile b/docker/fedora-cross-win/Dockerfile deleted file mode 100644 index 42ae4b8..0000000 --- a/docker/fedora-cross-win/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM fedora:25 -MAINTAINER Konstantin Dmitriev - -#VOLUME /synfig-buildroot - -#RUN dnf -y update - -RUN dnf -y install git sudo - -RUN dnf -y install intltool autoconf automake libtool libtool-ltdl-devel - -RUN dnf -y install mingw32-gcc-c++ mingw32-cpp - -RUN dnf -y install mingw32-adwaita-icon-theme mingw32-hicolor-icon-theme mingw32-libxml++ mingw32-cairo mingw32-pango mingw32-boost mingw32-libjpeg-turbo mingw32-gtkmm30 mingw32-glibmm24 mingw32-libltdl mingw32-dlfcn mingw32-SDL mingw32-fftw - -RUN dnf -y install mingw64-gcc-c++ mingw64-cpp - -RUN dnf -y install mingw64-adwaita-icon-theme mingw64-hicolor-icon-theme mingw64-libxml++ mingw64-cairo mingw64-pango mingw64-boost mingw64-libjpeg-turbo mingw64-gtkmm30 mingw64-glibmm24 mingw64-libltdl mingw64-dlfcn mingw64-SDL mingw64-fftw - -RUN dnf -y install mingw32-nsis - -RUN dnf -y install p7zip ImageMagick - -RUN dnf -y install make wget xz which - -#RUN dnf -y install synfig - -RUN cd /opt && git clone https://gitlab.com/morevnaproject-builds/synfig-linux64 -COPY files/synfig /usr/local/bin/synfig -RUN chmod +x /usr/local/bin/synfig - -RUN dnf -y install unzip zip - -RUN dnf -y install dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts - -# deps for synfig appimage -RUN dnf -y install fuse fuse-libs bzip2 bzip2-libs libXdmcp - -# native build tools -RUN dnf -y install gcc gcc-c++ make automake autoconf flex -RUN dnf -y install bison -RUN dnf -y install zlib-devel -RUN dnf -y install libffi-devel -RUN dnf -y install libmount-devel -RUN dnf -y install python2-devel -RUN dnf -y install xorg-x11-util-macros -RUN dnf -y install mesa-libEGL-devel -RUN dnf -y install freetype-devel -RUN dnf -y install expat-devel -RUN dnf -y install libXi-devel -RUN dnf -y install dbus-devel -RUN dnf -y install libXtst-devel -RUN dnf -y install bzip2-devel - -# additional mingw build tools -RUN dnf -y install mingw64-gcc-gfortran -RUN dnf -y install mingw32-gcc-gfortran - -# great! -RUN rm /usr/local/bin/synfig - - -#RUN groupadd -g 1111 konstantin && useradd -u 1111 -g konstantin konstantin - -#RUN groupadd sudo && usermod -aG sudo konstantin - -#USER konstantin - -CMD ["/bin/bash"] diff --git a/docker/fedora-cross-win/build.sh b/docker/fedora-cross-win/build.sh deleted file mode 100755 index d75bff4..0000000 --- a/docker/fedora-cross-win/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -SCRIPT_DIR=$(cd `dirname "$0"`; pwd) -BASE_DIR=`dirname "$SCRIPT_DIR"` -BASE_DIR=`dirname "$BASE_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 morevna/build-fedora-cross-win $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker/fedora-cross-win/files/synfig b/docker/fedora-cross-win/files/synfig deleted file mode 100644 index 50c7d12..0000000 --- a/docker/fedora-cross-win/files/synfig +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -APPIMAGE_WORKDIR=$PWD /build/packet/linux-x64/synfigstudio-appimage/install_release/synfigstudio.appimage "$@" diff --git a/docker/fedora-cross-win/run.sh b/docker/fedora-cross-win/run.sh deleted file mode 100755 index 398e484..0000000 --- a/docker/fedora-cross-win/run.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -SCRIPT_DIR=$(cd `dirname "$0"`; pwd) -BASE_DIR=`dirname "$SCRIPT_DIR"` -BASE_DIR=`dirname "$BASE_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 -mkdir -p $PACKET_BUILD_DIR - -export NATIVE_PLATFORM=fedora -if [ -z "$PLATFORM" ]; then - export PLATFORM=win -fi -if [ -z "$TASK" ]; then - export TASK=builder-$NATIVE_PLATFORM -fi -export INSTANCE=$TASK-$PLATFORM$ARCH - -docker stop "$INSTANCE" || true -docker rm "$INSTANCE" || true -docker run -it \ - --name "$INSTANCE" \ - --privileged=true \ - $DOCKER_RUN_OPTIONS \ - -v "$PACKET_BUILD_DIR:/build/packet" \ - -v "$SCRIPT_BUILD_DIR:/build/script" \ - -e NATIVE_PLATFORM="$NATIVE_PLATFORM" \ - -e NATIVE_ARCH="$NATIVE_ARCH" \ - -e PLATFORM="$PLATFORM" \ - -e ARCH="$ARCH" \ - -e THREADS="$THREADS" \ - morevna/build-fedora-cross-win \ - /build/script/common/manager.sh "$@" - diff --git a/docker/fedora-cross-win/run32.sh b/docker/fedora-cross-win/run32.sh deleted file mode 100755 index 4818e79..0000000 --- a/docker/fedora-cross-win/run32.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -ARCH=32 $(cd `dirname "$0"`; pwd)/run.sh "$@" diff --git a/docker/fedora-cross-win/run64.sh b/docker/fedora-cross-win/run64.sh deleted file mode 100755 index bf895b2..0000000 --- a/docker/fedora-cross-win/run64.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -ARCH=64 $(cd `dirname "$0"`; pwd)/run.sh "$@" diff --git a/docker/run.sh b/docker/run.sh index 6f6bb71..c192ca1 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -3,7 +3,7 @@ SCRIPT_DIR=$(cd `dirname "$0"`; pwd) if [ "$PLATFORM" = "win" ]; then - "$SCRIPT_DIR/fedora-cross-win/run.sh" "$@" + "$SCRIPT_DIR/debian-7-64bit/run.sh" "$@" elif [ "$ARCH" = "32" ]; then "$SCRIPT_DIR/debian-7-32bit/run.sh" "$@" else