diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb1766aebd712d636b895cc3bc90d75994a9f4f8..60ddd4bb78e9bf7020a31b2754efdc7792ddf1ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,10 +38,7 @@ build_wine-tibbo: - vagrant - develop19216822423 before_script: - - cp *.sh wine-tibbo/ - - cp SkeletonVagrantfile wine-tibbo/Vagrantfile - cd wine-tibbo - - python ../make.py meta script: - cd $CI_PROJECT_DIR - cd wine-tibbo diff --git a/SkeletonVagrantfile b/SkeletonVagrantfile index 7ce9f9474980152cf5d20c443c2c15f5f7e7b288..59e9a14b5d46e348749a30f3263fb7fa931aea33 100644 --- a/SkeletonVagrantfile +++ b/SkeletonVagrantfile @@ -1,6 +1,6 @@ Vagrant.configure("2") do |config| - config.vm.box = "debian/contrib-jessie64" + config.vm.box = "debian/contrib-jessie32" config.vm.provider "virtualbox" do |v| v.memory = 1260 diff --git a/wine-tibbo/Vagrantfile b/wine-tibbo/Vagrantfile new file mode 100644 index 0000000000000000000000000000000000000000..6f9e5b413712e4d4f6a3af4bbbd1fc27b3c67251 --- /dev/null +++ b/wine-tibbo/Vagrantfile @@ -0,0 +1,31 @@ + +Vagrant.configure("2") do |config| + config.vm.box = "debian/contrib-jessie32" + + config.vm.provider "virtualbox" do |v| + v.memory = 1260 + v.cpus = 3 + config.vm.synced_folder "/var/www/html/dev/misc", "/wynurz-utils", :mount_options => ["ro"] + end + + config.vm.provision "shell", inline: <<-SHELL + apt-get update + apt-get install -y curl + + bash build.sh + su vagrant -c 'bash /vagrant/build_as_vagrant.sh' + + # Minify + apt-get clean + rm -f /usr/bin/wynurz + dd if=/dev/zero of=/EMPTY bs=1M + rm -f /EMPTY + rm -rf /tmp/* + # udev rules + rm /etc/udev/rules.d/70-persistent-net.rules || true + mkdir /etc/udev/rules.d/70-persistent-net.rules || true + rm -rf /dev/.udev/ || true + rm /lib/udev/rules.d/75-persistent-net-generator.rules || true + + SHELL +end diff --git a/wine-tibbo/build.sh b/wine-tibbo/build.sh index 2efb7a2a27ec9d05ba313d4873bd5ef405f8452b..8b4eb9da826c4400cf827053ef7dae42908c732c 100644 --- a/wine-tibbo/build.sh +++ b/wine-tibbo/build.sh @@ -11,9 +11,8 @@ apt-get install -y mono-complete winbind # winbind - ntlm_auth for .NET # Install WINE echo "deb http://httpredir.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list -dpkg --add-architecture i386 apt-get update -apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine:i386/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports winetricks +apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports winetricks # Install command cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build diff --git a/wine-tibbo/build_as_vagrant.sh b/wine-tibbo/build_as_vagrant.sh index 2618d0a0f86e96803ba0920bd321f6885a1e073d..47b2a549f70a71f3b90468a150c9d4f3cfa38d97 100644 --- a/wine-tibbo/build_as_vagrant.sh +++ b/wine-tibbo/build_as_vagrant.sh @@ -3,7 +3,6 @@ set -e set -x export DISPLAY=:0.0 -export WINEARCH="win32" export WINEPREFIX="/home/vagrant/.wine" cd /home/vagrant