Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs to use docker image #6437

Merged
merged 28 commits into from
Aug 11, 2023
Merged

Update docs to use docker image #6437

merged 28 commits into from
Aug 11, 2023

Conversation

tephenavies
Copy link
Contributor

@tephenavies tephenavies commented Jul 19, 2022

This PR is a major update of getting started and deployment docs for docs.terria.io. Docs now emphasise using docker image & Kubernetes. Preview at https://docker-docs--terriajs-docs-v8.netlify.app/guide/

Test against TerriaJS/TerriaMap#644

@AnaBelgun
Copy link
Member

Update 15 Feb 2023:

  • TODO - rewrite the deployment section

Comment on lines +3 to +7
- [Getting Started](getting-started.md): Quick start guide to building your first TerriaJS application.
- [Customizing](customizing/README.md): Configure and tweak a TerriaJS application, including skinning and setting up the catalog.
- [Connecting to Data](connecting-to-data/README.md): Connect TerriaJS to your servers and data.
- [Deploying](deploying/README.md): Deploy a TerriaJS application in simple and advanced scenarios.
- [Contributing](contributing/README.md): Add new features to TerriaJS, be part of the TerriaJS development team, set up a development environment, write tests, and perform code reviews.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prettier reformats lists with extra spaces after bullets when using indent_size=4. It's a little ugly, but indent_size=4 is needed for mkdocs, and it's still better to use Prettier than to have to enforce indent_size=4 manually.

tephenavies added a commit to TerriaJS/TerriaMap that referenced this pull request Jun 6, 2023
@tephenavies tephenavies marked this pull request as ready for review June 6, 2023 15:32
@peterhassall peterhassall self-assigned this Jun 7, 2023
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New doc file (basically the old getting started)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reworded this one a bit to point to Docker & Kubernetes

Copy link
Contributor Author

@tephenavies tephenavies Jun 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved pm2 instructions to 1 subsection

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove old aws deploy docs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Major simplification now that helm 3 and easier to use docker tooling (Docker Desktop & Rancher Desktop) exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting started overhaul based on Docker. Much of the previous content was moved to customizing/cloning-and-building.md.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new link rewriter allows us to put links to code in our docs

gulpfile.js Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor tasks to allow running the quick doc generation stuff (CatalogMember page generation & mkdocs) without re-running build-for-doc-generation, which takes ages with Babel.

from:

[17:31:00] ├─┬ docs
[17:31:00] │ └─┬ <series>
[17:31:00] │   ├─┬ user-guide
[17:31:00] │   │ └─┬ <series>
[17:31:00] │   │   ├─┬ <parallel>
[17:31:00] │   │   │ ├── code-attribution
[17:31:00] │   │   │ └── build-for-doc-generation
[17:31:00] │   │   └── userGuide                  < Couldn't be run separately
[17:31:00] │   └── docs

to:

[17:26:15] ├─┬ docs
[17:26:15] │ └─┬ <series>
[17:26:15] │   ├─┬ <parallel>
[17:26:15] │   │ ├── code-attribution
[17:26:15] │   │ └── build-for-doc-generation
[17:26:15] │   ├─┬ render-guide                < This is now its own task
[17:26:15] │   │ └─┬ <series>
[17:26:15] │   │   ├── copyToBuild
[17:26:15] │   │   ├── generateMemberPages
[17:26:15] │   │   └── mkdocs
[17:26:15] │   └── docs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of translation string improvements. These should probably have been a separate PR.

Comment on lines 204 to 210
```ts
async function forceLoadX() {
const url = this.someObservableUrl;
const someData = await loadText(url);
runInAction(() => (this.someOtherObservable = someData));
const url = this.someObservableUrl;
const someData = await loadText(url);
runInAction(() => (this.someOtherObservable = someData));
}
```
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent_size=4 is even worse for code blocks in md files, but there's no prettier or editorconfig configuration that would fix this, and using 2 spaces would require patching mkdocs as the author of the parser used believes that lists in lists must be indented by 4 spaces exactly to be valid markdown.

@tephenavies tephenavies removed their assignment Jun 7, 2023
@staffordsmith83
Copy link
Contributor

UPDATE 21 June 2023:

Pete should be able to finish today after meeting

@tephenavies tephenavies removed their assignment Aug 4, 2023
@mwu2018 mwu2018 self-assigned this Aug 11, 2023
@tephenavies tephenavies merged commit b14835b into main Aug 11, 2023
@tephenavies tephenavies deleted the docker-docs branch August 11, 2023 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants