Skip to content

Commit 9cf68b3

Browse files
authored
Merge pull request #129 from epics-containers/tidyup
tidy some formatting
2 parents 8cea482 + c8fcf0d commit 9cf68b3

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

docs/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@
105105
inheritance_graph_attrs = {"rankdir": "TB"}
106106

107107
# Ignore localhost links for periodic check that links in docs are valid
108-
linkcheck_ignore = [r"http://localhost:\d+/"]
108+
linkcheck_ignore = [
109+
r"http://localhost:\d+/",
110+
"https://gitlab.diamond.ac.uk/.*",
111+
"https://dev-portal.diamond.ac.uk/.*",
112+
]
109113

110114
# Set copy-button to ignore python and bash prompts
111115
# https://sphinx-copybutton.readthedocs.io/en/latest/use.html#using-regexp-prompt-identifiers

docs/overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ There are 5 themes to this strategy:
55

66
```{eval-rst}
77
8+
:Containers:
9+
Package IOC software and execute it in a lightweight virtual environment​
10+
811
:Kubernetes:
912
Centrally orchestrates all IOCs at a facility.
1013

docs/tutorials/generic_ioc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ you can:
674674
- stop the IOC with `ctrl-d` in the ioc shell
675675
- start the IOC with `./start.sh`
676676
677-
# Wrapping Up
677+
## Wrapping Up
678678
679679
For the final step we will get the Generic IOC container image published to GHCR. This means committing all our changes and pushing them up to GitHub so that the Continuous Integration system can build the container image and publish it.
680680

docs/tutorials/setup_k8s_new_beamline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Answer the copier template questions as follows:
8181
DLS Users: These instructions are for the BL46P beamline. This beamline is a training rig and it is OK to install some test Simulation IOCs on it. However you will need to get access before you can deploy to it. Ask giles to request access to the `p46-iocs` namespace on the `pollux` cluster. In future the ec-services-template will be updated to allow you to deploy IOCs to your own namespace on the `pollux` cluster.
8282
:::
8383

84-
# Review the New Beamline Repository
84+
## Review the New Beamline Repository
8585

8686
The following sections are just a review of what the template project created. Those of you who are outside of DLS can use this as a guide to what you need to set up in your own beamline repository to talk you your own cluster. DLS users will already have these things set up by the copier template to talk to the p46-iocs namespace on pollux cluster. If you believe your repo is already configured to talk to your cluster then you could jump ahead to [](create-test-ioc-k8s).
8787

@@ -277,7 +277,7 @@ dataVolume:
277277
hostPath: /dls/p46/data
278278
```
279279
(create-test-ioc-k8s)=
280-
# Create a Test IOC to Deploy
280+
## Create a Test IOC to Deploy
281281
282282
TODO: This is work in progress (but essentially just repeat what we did in [](deploy-example-instance)).
283283

docs/tutorials/setup_workstation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ work. In the examples we will use `$HOME/ec-venv` as the virtual environment
108108
but you can choose any folder.
109109

110110
:::{Note}
111-
**DLS Users**: As `$HOME` is a network drive it has an 8GB limit, consider other locations such as `/dls/science/` or `/scratch/`. Read more [here]([url](https://gitlab.diamond.ac.uk/sscc-docs/developer-guide/-/issues/13))
111+
**DLS Users**: As `$HOME` is a network drive it has an 8GB limit, consider other locations such as `/dls/science/` or `/scratch/`. Read more [here](https://dev-portal.diamond.ac.uk/guide/developer-environment/how-tos/disk-quota-troubleshooting/)
112112
:::
113113

114114
```bash

0 commit comments

Comments
 (0)