Skip to content

Commit 791bfcc

Browse files
authored
Merge pull request #161 from epics-containers/minor-fixes
tidy python version instructions, fix profile references
2 parents ee9311a + 82f233b commit 791bfcc

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

docs/reference/docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ We do fully support `docker`, please report any issues you find.
1313

1414
There are a few things to know if you are using `docker` in your developer containers:
1515

16-
1. add `export EC_REMOTE_USER=$USER` into your `~/.profile`. The epics-containers devcontainer.json files will use this to set the account that your user will use inside devcontainers.
16+
1. add `export EC_REMOTE_USER=$USER` into your `$HOME/.profile`. The epics-containers devcontainer.json files will use this to set the account that your user will use inside devcontainers.
1717
1. you may need to tell git that you are ok with the repository permissions. `vscode` may ask you about this or you may need to do the command:
1818
```bash
1919
git config --global --add safe.directory <Git folder>

docs/reference/environment.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# The Environment Configuration File
22

3+
:::{warning}
4+
This page is out of date - the environment.sh varies depending on the type of project:
5+
- services using compose
6+
- services using helm
7+
- deployment
8+
9+
This page needs to be updated to reflect the different types of environment.sh files.
10+
:::
11+
312
`environment.sh` is a configuration file that is provided in each domain
413
(beamline or accelerator) repository. It is used to set up the environment
514
such that the `epics-containers-cli` will interact with the correct
@@ -77,17 +86,16 @@ The second section of the `environment.sh` file is used to install the
7786
it would probably be best to have `ec` installed globally on your
7887
workstation and then omit this section from your `environment.sh` files.
7988

80-
Perhaps the simplest way to achieve this is to install `ec` into your user
81-
space using the following command:
89+
Perhaps the simplest way to achieve this is to install `ec` into your user space using the following command:
8290

8391
```bash
84-
pip install --user epics-containers-cli
92+
pip install --user ec-cli
8593
```
8694

87-
Then add the following to your `.bashrc` file:
95+
Then add the following to your `$HOME/.profile` file:
8896

8997
```bash
90-
export PATH=$PATH:$HOME/.local/bin
98+
PATH=$PATH:$HOME/.local/bin
9199
```
92100

93101
## Connecting to a Namespace on your Kubernetes Cluster

docs/tutorials/dev_container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Users of docker need to instruct the devcontainer to use their own user id insid
154154
export EC_REMOTE_USER=$USER
155155
```
156156

157-
It is recommended that you place this command in **.profile** to make it permanent.
157+
It is recommended that you place this command in `$HOME/.profile` to make it permanent.
158158

159159
If you do not do this, your devcontainer will run as root. Although it will still work, it is not recommended. Also, forgetting to set EC_REMOTE_USER before launching a pre-existing devcontainer will cause errors. (my apologies to docker users - I wanted to make the devcontainer compatible with both docker and podman and this is the least invasive method I could come up with).
160160
:::

docs/tutorials/setup_workstation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ From here on when we refer to `docker` in a command line, you can replace it wit
144144
```bash
145145
alias docker=podman
146146
```
147-
in your `.bashrc` file.
147+
in your `$HOME/.profile` file.
148148

149149
`docker` users should also take a look at this page: [](../reference/docker.md) which describes a couple of extra steps that are required to make docker work in developer containers.
150150

@@ -176,7 +176,7 @@ podman completion zsh > ~/.oh-my-zsh/completions/_podman
176176
**DLS Users**: for this step just use `module load python/3.11`
177177
:::
178178

179-
Go ahead and install Python 3.11 or later.
179+
Go ahead and install Python if it is not already installed, the minimum version you should use is 3.10. Virtualbox Appliance users will already have Python 3.10 installed.
180180

181181
There are instructions for installing Python on all platforms here:
182182
<https://docs.python-guide.org/starting/installation/>
@@ -198,7 +198,7 @@ source $HOME/ec-venv/bin/activate
198198
python3 -m pip install --upgrade pip
199199
```
200200

201-
Note that each time you open a new shell you will need to activate the virtual environment again. (Or place its bin folder in your path by adding `PATH=$HOME/ec-venv/bin:$PATH` in your .bashrc).
201+
Note that each time you open a new shell you will need to activate the virtual environment again. (Or place its bin folder in your path by adding `PATH=$HOME/ec-venv/bin:$PATH` in your `$HOME/.profile`).
202202

203203
(copier)=
204204

0 commit comments

Comments
 (0)