From 8c079a4ac063a11b3d14c4195214b06bb6a06452 Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Mar 12 2017 16:08:41 +0000 Subject: add a Atomic prerelease page - still needs script and links --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 5918b4e..7788d30 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -12,7 +12,7 @@ release={ 'curr_alt_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_AMI_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_atomic_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_atomic_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'prev_arm_id': '24', 'prev_alt_id': '24', 'prev_cloud_id': '24', @@ -253,6 +253,7 @@ iso_size={ 'pre_atomic_qcow2_cloud': '???', # In MB 'pre_atomic_VBvag_cloud': '???', # In MB 'pre_atomic_libvag_cloud': '???', # In MB + 'pre_atomic_iso': '918', # In MB 'pre_x86_64_docker': '40', # In MB 'pre_VBvag_cloud': '237', # In MB 'pre_libvag_cloud': '227', # In MB diff --git a/getfedora.org/data/content/atomic/prerelease/docker.html b/getfedora.org/data/content/atomic/prerelease/docker.html deleted file mode 100644 index e9e74bb..0000000 --- a/getfedora.org/data/content/atomic/prerelease/docker.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - ${Markup(_('Download Fedora Cloud %s')) % global_variables.release['curr_state']} - - - - - - -
-
-
-
-

${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- -
-
-
-
- - -
-
-
- -
-
- -
-
-
- -
-
-
-
-
-

${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})} - ${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} - - -

-

${Markup(_('Docker %(state)s Image')) % {'state': global_variables.release['curr_state']}}

-

${_('The Fedora Docker Base Image is a minimal Fedora install which can be spawned as a Docker container. It contains basic tools which can be used as a foundation for building Docker Layered Images - bash, vi and yum (and its dependencies).')}

-

${_('Docker Base Image')}

-
-
-
-
-

${_('You can easily load this Docker image into your running Docker daemon using command:')}

- 
docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64.tar.xz
-

${_('Following command can be used to spawn a container running bash inside:')}

- 
docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64 bash
- ${_('Download')} -

${_('64-bit %sMB raw.xz Image') % global_variables.iso_size['pre_x86_64_docker']}

-
-
- -
-
-

${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}

- - - - - - - - - - - - - - - - - - - - - -
${_('Release State')}${_('Release Date')}
${_('Alpha Release Public Availability')}${schedule['alpha']}
${_('Beta Release Public Availability')}${schedule['beta']}
${_('Final Release Public Availability (GA)')}${schedule['final']}
- ${_('Read all the key milestones of the release schedule...')} -
-
- -
-
- -

${_('Verify your Image')}

-

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

-
-
- ${_('Docker 64bit!')} -
-
-
-
- -
- -
- -
-
-
- - - - - - - - diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index d50506d..3320f23 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -7,11 +7,12 @@ - ${Markup(_('Download Fedora Cloud %s')) % global_variables.release['curr_state']} + ${_('Download Fedora Atomic')} + +

${Markup(_('Download Fedora %(rel)s %(state)s Atomic Host')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

+

${_('Atomic Host is built every 2 weeks or so.')}

+

${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(atomic_age)s days ago. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}

+

${Markup(_('These are the latest official Fedora Atomic Host images, produced %(atomic_age)s days ago.') % global_variables.release)}

- -
-
-
- -
-
- -
-
-
-
@@ -71,166 +48,49 @@

${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})} ${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')} - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} + ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})} - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} + ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})}

-

${Markup(_('Base Cloud %(state)s Images')) % {'state': global_variables.release['curr_state']}}

-

${_('The images on this page are Fedora Cloud images for creating general purpose virtual machines (VMs).')}

-

${_('Base Cloud Image')}

-
-
- -
-
-
${_('qcow2 Image')}
-

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} -

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_qcow2_x86_64_cloud']}

-
-
-
${_('Raw Image')}
-

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} -

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_raw_x86_64_cloud']}

-
-
- - - - - - - -
-
-

${_('Base Cloud Images for Amazon Public Cloud EC2')}

-

${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}

-

${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}

+
+

${_('Atomic Host Images for Amazon Public Cloud EC2')}

+

${_('The links below will provide you listings of available Atomic Host Hardware Virtual Machine (HVM) AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}

-
${_('Hardware Virtual Machine (HVM)')}
-

${_('If you\'re unsure which image to choose, use this format. It can provide the same or better performance than PV images.')}

+
${_('GP2 Format')}
+

${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}

- - -
-
- - -