This is an automated email from the ASF dual-hosted git repository. joshfischer pushed a commit to branch joshfischer/0.20.4-incubating-site in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit b2776918bbf171922f762c49506db6c4a11cf2eb Author: Josh Fischer <[email protected]> AuthorDate: Wed May 26 18:16:34 2021 -0500 initial changes --- website2/docs/getting-started-docker.md | 28 +++++ website2/docs/getting-started-local-single-node.md | 50 ++++---- website2/website/heron-release.json | 4 +- website2/website/pages/en/download.js | 138 +++++++++++++++++---- website2/website/releases.json | 4 - website2/website/sidebars.json | 1 + website2/website/siteConfig.js | 1 + 7 files changed, 171 insertions(+), 55 deletions(-) diff --git a/website2/docs/getting-started-docker.md b/website2/docs/getting-started-docker.md new file mode 100644 index 0000000..fc9ec79 --- /dev/null +++ b/website2/docs/getting-started-docker.md @@ -0,0 +1,28 @@ +--- +id: getting-started-docker +title: The official Apache Heron Docker Image(s) +sidebar_label: Heron & Docker +--- +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +> The current version of Heron is {{heron:version}} + +The official Apache Heron Docker image is located at the link below + +<a target="_blank" href="https://hub.docker.com/repository/docker/apache/heron";>https://hub.docker.com/repository/docker/apache/heron</a> + diff --git a/website2/docs/getting-started-local-single-node.md b/website2/docs/getting-started-local-single-node.md index 984b090..0408a86 100644 --- a/website2/docs/getting-started-local-single-node.md +++ b/website2/docs/getting-started-local-single-node.md @@ -21,37 +21,41 @@ sidebar_label: Local (Single Node) --> > The current version of Heron is {{heron:version}} +For other platforms, you need to build from source. Please refer to the [guide to compiling Heron](compiling-overview). -The current way to get started learning Heron is to build from source. -Please refer to the [guide to compiling Heron](compiling-overview). The Heron community is working to add release scripts and Heron -binaries available from Apache mirrors soon. +## Step 1 --- Download the Heron tools -* [MacOS](#macos-homebrew) -* [Ubuntu 18.04](#using-installation-scripts) -* [CentOS](#using-installation-scripts) +Heron tools can be installed using [installation scripts](#using-installation-scripts). -## Building installation scripts +> Note: As of version 0.20.4-incubating, there is a python compatibility on OSX. +> The supported platforms are CentOS7, Debian10, and Ubuntu18.04. -The only way to obtain the installation scripts at this time are to compile from source. We are working to add release scripts and Heron -binaries available from Apache mirrors soon. +## Using installation scripts -See how to get setup building Heron see the notes [here](compiling-overview.md) +To install Heron binaries directly, using installation scripts, go to Heron's [releases page](https://github.com/apache/incubator-heron/releases) on GitHub +and see a full listing of Heron releases for each available platform. The installation script for macOS (`darwin`), for example, is named +`heron-install-{{% heronVersion %}}-darwin.sh`. -If you already have Bazel and the other required tools installed for your platform you can execute the following: +```bash +$ wget https://github.com/apache/incubator-heron/releases/download/{{% heronVersion %}}/heron-install-{{% heronVersion %}}-darwin.sh + + +``` + +Download the for your platform either from the releases page or using [`wget`](https://www.gnu.org/software/wget/). Here's a `wget` example for Ubuntu: ```bash -$ bazel build --config=[platform] scripts/packages:binpkgs +$ wget https://github.com/apache/incubator-heron/releases/download/{{% heronVersion %}}/heron-install-{{% heronVersion %}}-ubuntu18.04.sh ``` -Options for the config flag are: -* `debian` (Debian10) -* `ubuntu` (Ubuntu) -* `darwin` (OSX) - -This command will take approximately 45 minutes to compile based on your machine settings. - It will output a script called `heron-install.sh` You will be able to find it relative to the Heron root folder: - - ```bash -$ ./bazel-bin/scripts/packages/heron-install.sh +Debian10 +```bash +$ wget https://github.com/apache/incubator-heron/releases/download/{{% heronVersion %}}/heron-install-{{% heronVersion %}}-debian.sh +``` + +Once you've downloaded the script, make it executable using [chmod](https://en.wikipedia.org/wiki/Chmod): + +```bash +$ chmod +x heron-*.sh ``` Now run the [Heron client](user-manuals-heron-cli) installation script with the `--user` flag set. Here's an example: @@ -59,7 +63,7 @@ Now run the [Heron client](user-manuals-heron-cli) installation script with the > The script will install executables in the `~/bin` folder. You should add > that folder to your `PATH` using `export PATH=~/bin:$PATH`. ```bash -$ ./heron-install.sh --user +$ ./heron-install-{{% heronVersion %}}-ubuntu.sh --user Heron installer --------------- diff --git a/website2/website/heron-release.json b/website2/website/heron-release.json index 666bcb3..f5fd3d0 100644 --- a/website2/website/heron-release.json +++ b/website2/website/heron-release.json @@ -1,3 +1,5 @@ [ - "0.20.3-incubating" + "0.20.4-incubating", + "0.20.3-incubating", + "0.20.0-incubating" ] \ No newline at end of file diff --git a/website2/website/pages/en/download.js b/website2/website/pages/en/download.js index df631b5..d3fe12b 100644 --- a/website2/website/pages/en/download.js +++ b/website2/website/pages/en/download.js @@ -8,37 +8,69 @@ const GridBlock = CompLibrary.GridBlock; const CWD = process.cwd(); const siteConfig = require(`${CWD}/siteConfig.js`); -const releases = require(`${CWD}/releases.json`); const heronReleases = require(`${CWD}/heron-release.json`) function getLatestArchiveMirrorUrl(version, type) { - return `https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/heron/heron-${version}/heron-${version}-${type}.tar.gz` + return `http://www.apache.org/dyn/closer.cgi/incubator/heron/heron-${version}/heron-${version}-${type}.tar.gz?action=download` +} + +function getTarUrl(version, type) { + return `https://downloads.apache.org/incubator/heron/heron-${version}/heron-${version}-${type}.tar.gz` +} + +function getInstallScriptCryptoUrl(version, osType) { + return `https://downloads.apache.org/incubator/heron/heron-${version}/heron-install-${version}-${osType}.sh` } function distUrl(version, type) { - return `https://www.apache.org/dist/incubator/heron/heron-${version}/heron-${version}-${type}.tar.gz` + return `http://www.apache.org/dyn/closer.cgi/incubator/heron/heron-${version}/heron-${version}-${type}.tar.gz?action=download` +} + +function getInstallScriptMirrorUrl(version, type) { + return `http://www.apache.org/dyn/closer.cgi/incubator/heron/heron-${version}/heron-install-${version}-${type}.sh` } function archiveUrl(version, type) { if (version.includes('incubating')) { - return `https://archive.apache.org/dist/incubator/heron/heron-${version}/apache-heron-v-${version}-${type}.tar.gz` + + return `https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/incubator/heron/heron-${version}/` + getProperEndpoint(version, type) } else { - return `https://archive.apache.org/dist/heron/heron-${version}/apache-heron-v-${version}-${type}.tar.gz` + return `https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=heron/heron-${version}/` + getProperEndpoint(version, type) } } +function getProperEndpoint(version, type) { + + if (version == "0.20.0-incubating") { + return `apache-heron-v-${version}-${type}.tar.gz` + } + if (type == "source") { + type = "src"; + } + return `heron-${version}-${type}.tar.gz` +} + class Download extends React.Component { render() { - const latestVersion = releases[0]; const latestHeronVersion = heronReleases[0]; - const latestArchiveMirrorUrl = getLatestArchiveMirrorUrl(latestVersion, 'bin'); - const latestSrcArchiveMirrorUrl = getLatestArchiveMirrorUrl(latestVersion, 'src'); - const latestArchiveUrl = distUrl(latestVersion, 'bin'); - const latestSrcArchiveUrl = distUrl(latestVersion, 'src') - - const releaseInfo = releases.map(version => { + const latestArchiveMirrorUrl = getLatestArchiveMirrorUrl(latestHeronVersion, 'bin'); + const latestSrcArchiveMirrorUrl = getLatestArchiveMirrorUrl(latestHeronVersion, 'src'); + const latestSrcUrl = getTarUrl(latestHeronVersion, "src"); + const latestDebian10TarUrl = getTarUrl(latestHeronVersion, "debian10"); + const latestArchiveUrl = distUrl(latestHeronVersion, 'bin'); + const latestSrcArchiveUrl = distUrl(latestHeronVersion, 'src') + const centos7InstallUrl = getInstallScriptMirrorUrl(latestHeronVersion, "centos7") + const centos7InstallCryptoUrl = getInstallScriptCryptoUrl(latestHeronVersion, "centos7") + const debian10InstallUrl = getInstallScriptMirrorUrl(latestHeronVersion, "debian10") + const debian10InstallCryptoUrl = getInstallScriptCryptoUrl(latestHeronVersion, "debian10") + const ubuntu1804InstallUrl = getInstallScriptMirrorUrl(latestHeronVersion, "ubuntu18.04") + const ubuntu1804InstallCryptoUrl = getInstallScriptCryptoUrl(latestHeronVersion, "ubuntu18.04") + + + + const releaseInfo = heronReleases.map(version => { return { version: version, binArchiveUrl: archiveUrl(version, 'bin'), @@ -56,19 +88,12 @@ class Download extends React.Component { <hr /> </header> - <h2>Release notes</h2> - <div> - <p> - <a href={`${siteConfig.baseUrl}${this.props.language}/release-notes`}>Release notes</a> for all Heron's versions - </p> - </div> - <h2 id="latest">Current version (Stable) {latestHeronVersion}</h2> <table className="versions" style={{width:'100%'}}> <thead> <tr> <th>Release</th> - <th>Link</th> + <th>Direct Download Link</th> <th>Crypto files</th> </tr> </thead> @@ -78,16 +103,77 @@ class Download extends React.Component { <tr key={'source'}> <th>Source</th> <td> - <a href={latestSrcArchiveMirrorUrl}>apache-heron-{latestVersion}-src.tar.gz</a> + <a href={latestSrcArchiveMirrorUrl}>heron-{latestHeronVersion}-src.tar.gz</a> </td> <td> - <a href={`${latestSrcArchiveUrl}.asc`}>asc</a>, - <a href={`${latestSrcArchiveUrl}.sha512`}>sha512</a> + <a href={`${latestSrcUrl}.asc`}>asc</a>, + <a href={`${latestSrcUrl}.sha512`}>sha512</a> + </td> + </tr> + <tr key={'binary'}> + <th>Debian10 Binary</th> + <td> + <a href={latestSrcArchiveMirrorUrl}>heron-{latestHeronVersion}-debian10.tar.gz</a> + </td> + <td> + <a href={`${latestDebian10TarUrl}.asc`}>asc</a>, + <a href={`${latestDebian10TarUrl}.sha512`}>sha512</a> </td> </tr> </tbody> </table> + <h2 id="latest">Heron Install Scripts</h2> + <h3 style={{color:"red"}}> READ BEFORE DOWNLOADING </h3> + <p> + To download the Heron self-extracting install scripts: click a link below for the Operating System of your choice that will show the closest mirror for you to download from. + Once you are on the page with the closest mirror right click on the link and select “save as” to download the install script. + If you do not right click the link will only bring you to view the script in the browser and will not start a download. + </p> + <table className="versions" style={{width:'100%'}}> + <thead> + <tr> + <th>Release</th> + <th>Link to find the closest mirror</th> + <th>Crypto files</th> + </tr> + </thead> + <tbody> + + + <tr key={'centos-install'}> + <th>CentOS7</th> + <td> + <a href={`${centos7InstallUrl}`}> heron-install-0.20.4-incubating-centos7.sh</a> + </td> + <td> + <a href={`${centos7InstallCryptoUrl}.asc`}>asc</a>, + <a href={`${centos7InstallCryptoUrl}.sha512`}>sha512</a> + </td> + </tr> + <tr key={'debian10-install'}> + <th>Debian10</th> + <td> + <a href={`${debian10InstallUrl}`}> heron-install-0.20.4-incubating-debian10.sh</a> + </td> + <td> + <a href={`${debian10InstallCryptoUrl}.asc`}>asc</a>, + <a href={`${debian10InstallCryptoUrl}.sha512`}>sha512</a> + </td> + </tr> + <tr key={'ubuntu18.04-install'}> + <th>Ubuntu18.04</th> + <td> + <a href={`${ubuntu1804InstallUrl}`}> heron-install-0.20.4-incubating-ubuntu18.04.sh</a> + </td> + <td> + <a href={`${ubuntu1804InstallCryptoUrl}.asc`}>asc</a>, + <a href={`${ubuntu1804InstallCryptoUrl}.sha512`}>sha512</a> + </td> + </tr> + </tbody> + </table> + <h2>Release Integrity</h2> <MarkdownBlock> @@ -125,10 +211,8 @@ class Download extends React.Component { {releaseInfo.map( info => { var sha = "sha512" - if (info.version.includes('1.19.0-incubating') || info.version.includes('1.20.0-incubating')) { - sha = "sha" - } - return info.version !== latestVersion && ( + + return info.version !== latestHeronVersion && ( <tr key={info.version}> <th>{info.version}</th> diff --git a/website2/website/releases.json b/website2/website/releases.json deleted file mode 100644 index 99dd7df..0000000 --- a/website2/website/releases.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "0.20.3-incubating", - "0.20.0-incubating" -] \ No newline at end of file diff --git a/website2/website/sidebars.json b/website2/website/sidebars.json index a0324c5..05de426 100755 --- a/website2/website/sidebars.json +++ b/website2/website/sidebars.json @@ -4,6 +4,7 @@ "Getting Started": [ "getting-started-local-single-node", "getting-started-migrate-storm-topologies", + "getting-started-docker", "getting-started-troubleshooting-guide" ], "Deployment": [ diff --git a/website2/website/siteConfig.js b/website2/website/siteConfig.js index 78624bc..07ac976 100644 --- a/website2/website/siteConfig.js +++ b/website2/website/siteConfig.js @@ -65,6 +65,7 @@ const siteConfig = { // For github.io type URLs, you would set the url and baseUrl like: url: url, baseUrl: baseUrl, // Base URL for your project */ + gaTrackingId: "G-TY5B0S76DP", // Used for publishing and more projectName: 'incubator-heron',
