From ec308af898f0278683688bc67b05511678ab86cf Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Oct 31 2018 00:37:32 +0000 Subject: Merge #901 `Add scientific vagrant box to downloads page` --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index c816ed6..4f51fef 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -197,6 +197,8 @@ iso_size={ 'libvirt_Py_Class': '770', # In MB 'virtualbox_Py_Class': '806', # In MB 'ARM_Py_Class': '1.2', # In GB + 'libvirt_Scientific': '2.9', # In GB + 'virtualbox_Scientific': '2.9', # In GB # Labs prerelease 'pre_i686_Live_Security': '1.5', # In GB 'pre_x86_64_Live_Security':'1.6', # In GB diff --git a/labs.fedoraproject.org/data/content/scientific/download/index.html b/labs.fedoraproject.org/data/content/scientific/download/index.html index 98b9ff0..de11a26 100644 --- a/labs.fedoraproject.org/data/content/scientific/download/index.html +++ b/labs.fedoraproject.org/data/content/scientific/download/index.html @@ -26,9 +26,16 @@
-

${_('What is a Live image?')}

-

${_('Fedora Scientific is shipped as a live operating system. It\'s everything you need to try out Fedora\'s Scientific - you don\'t have to erase anything on your current system to try it out, and it won\'t put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.')}

-

${_('To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.')}

+

${Markup(_('The Scientific lab comes in two variants. A Live Image with KDE, that can be downloaded on the top of this page and Vagrant box for headless environments. Learn more about <a href="%s">Docker</a> and <a href="%s">Vagrant</a> in their documentation.') % ('https://docs.docker.com/get-started/', 'https://www.vagrantup.com/intro/getting-started/'))}

+

${_('Running the Vagrant box')}

+

${_('First, download the box from the right side of this page.')}

+

${_('For libvirt:')}

+ 
vagrant box add fedora/${global_variables.release['curr_id']}-scientific ./Fedora-Scientific-Vagrant-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.x86_64.vagrant-libvirt.box  
vagrant init fedora/${global_variables.release['curr_id']}-scientific 
vagrant up --provider libvirt 
vagrant ssh
+

${_('For VirtualBox:')}

+ 
vagrant box add fedora/${global_variables.release['curr_id']}-scientific ./Fedora-Scientific-Vagrant-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.x86_64.vagrant-virtualbox.box 
vagrant init fedora/${global_variables.release['curr_id']}-scientific 
vagrant up --provider virtualbox 
vagrant ssh
+

${_('What is a Live image?')}

+

${_('Fedora Scientific is shipped as a live operating system. It\'s everything you need to try out Fedora\'s Scientific - you don\'t have to erase anything on your current system to try it out, and it won\'t put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.')}

+

${_('To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.')}

${_('Other Downloads')}

@@ -37,6 +44,12 @@

  • ${Markup(_('32-bit %sGB Live image')) % global_variables.iso_size['i686_Live_Sci-kde']}

    • +
  • +

    ${Markup(_('Libvirt %sGB Vagrant image')) % global_variables.iso_size['libvirt_Scientific']}

    +
    • +
  • +

    ${Markup(_('VirtualBox %sGB Vagrant image')) % global_variables.iso_size['virtualbox_Scientific']}

    +

    • ${_('Older Releases')}