Skip to content

Commit

Permalink
Merge pull request #69 from kingdonb/fix-install-v2.sh
Browse files Browse the repository at this point in the history
fix install-v2.sh for teamhephy github org
  • Loading branch information
Cryptophobia authored Oct 19, 2018
2 parents 50024ef + 069dddc commit 6b44e68
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 18 deletions.
4 changes: 3 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ pages:
- v2.2.0: changelogs/v2.2.0.md
- v2.1.0: changelogs/v2.1.0.md
- v2.0.0: changelogs/v2.0.0.md
theme_dir: themes/deis
theme:
name: null
custom_dir: 'themes/deis'
docs_dir: src
markdown_extensions:
- markdown_checklist.extension
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mkdocs==0.15.3
mkdocs==1.0.3
markdown-checklist==0.4.1
markdown-include==0.5.1
7 changes: 3 additions & 4 deletions src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ application configuration, creating and rolling back releases, managing domain n
certificates, providing seamless edge routing, aggregating logs, and sharing applications with
teams. All of this is exposed through a simple REST API and command line interface.

Please note that this documentation is for Deis Workflow (v2). For v1 documentation visit
<http://docs.deis.io/en/latest/>.
Please note that this documentation is for Hephy Workflow (v2.19.4). Older versions of Deis and
Hephy Workflow are not supported.

## Getting Started

Expand All @@ -24,8 +24,7 @@ Feel like contibuting some code or want to get started as a maintainer? Pick an

## Service and Support

If you are interested in commercial service and support for Deis Workflow, check out the various
[services offerings on deis.com](https://deis.com/services).
Coming soon.


[arch]: understanding-workflow/architecture.md
Expand Down
2 changes: 1 addition & 1 deletion src/managing-workflow/upgrading-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ deis-workflow-manager-2654760652-kitf9 1/1 Running 0 5m
Users of Deis Workflow should now upgrade their deis client to avoid getting `WARNING: Client and server API versions do not match. Please consider upgrading.` warnings.

```
curl -sSL http://deis.io/deis-cli/install-v2.sh | bash && sudo mv deis $(which deis)
curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0 && sudo mv deis $(which deis)
```


Expand Down
2 changes: 1 addition & 1 deletion src/quickstart/install-cli-tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Use the CLI to create and configure and manage applications.

Install the latest `deis` client for Linux or Mac OS X with:

$ curl -sSL http://deis.io/deis-cli/install-v2.sh | bash
$ curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0

The installer places the `deis` binary in your current directory, but you
should move it somewhere in your $PATH:
Expand Down
2 changes: 1 addition & 1 deletion src/roadmap/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ Kick off https://ci.teamhephy.info/job/workflow-cli-build-stable/ with the `TAG`
and then verify `stable` artifacts are available and appropriately updated after the job completes:

```
$ curl -sSL http://deis.io/deis-cli/install-v2.sh | bash
$ curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0
$ ./deis version
# (Should show $WORKFLOW_RELEASE)
```
Expand Down
2 changes: 1 addition & 1 deletion src/users/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ with Deis Workflow.

Install the latest `deis` client for Linux or Mac OS X with:

$ curl -sSL http://deis.io/deis-cli/install-v2.sh | bash
$ curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0

The installer puts `deis` in your current directory, but you should move it
somewhere in your $PATH:
Expand Down
12 changes: 6 additions & 6 deletions themes/deis/base.html → themes/deis/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="keywords" content="{{ meta['keywords'] if meta }}" />
<meta name="keywords" content="{{ page.meta['keywords'] if page.meta }}" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{ page_description if page_description }}" />
{% if canonical_url %}<link rel="canonical" href="{{ canonical_url }}">{% endif %}
<meta name="description" content="{{ config.site_description if config.site_description }}" />
{% if page.canonical_url %}<link rel="canonical" href="{{ page.canonical_url }}">{% endif %}

<meta name="msvalidate.01" content="079E754911917142D42AB2A3694F9267" />
<meta name="msvalidate.01" content="08598E7D936D9217891AE6C1665A645D" />

<title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>

<script type="text/javascript">var documentationBaseURL = "{{ base_url}}"</script>
<link rel="icon" href="{{ base_url }}/static/img/favicon/favicon.png" type="image/png">
Expand All @@ -42,7 +42,7 @@
<div class="container">
<div class="row">
<div class="small-12">
{{ content }}
{{ page.content }}
</div>
</div>
</div>
Expand All @@ -62,7 +62,7 @@
<script src="{{ path }}" async></script>
{% endfor %}

{% if google_analytics %}
{% if config.google_analytics %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
4 changes: 2 additions & 2 deletions themes/deis/nav.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% for nav_item in nav %}
<li class="toctree-l1{% if nav_item.active %} current{% endif %}">
<a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url }}">{{ nav_item.title }}</a>
<a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url | url }}">{{ nav_item.title }}</a>
{% if nav_item.children %}
<ul style="display: none;"{% if nav_item.active %} class="current"{% endif %}>
{% for child in nav_item.children %}
<li class="toctree-l2{% if child.active %} current{% endif %}">
<a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url }}">{{ child.title }}</a>
<a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url | url }}">{{ child.title }}</a>
</li>
{% endfor %}
</ul>
Expand Down

0 comments on commit 6b44e68

Please sign in to comment.