Skip to content

Commit e329fa1

Browse files
committed
rename ec to dc
1 parent 65f996b commit e329fa1

10 files changed

+36
-37
lines changed

docs/tutorials/create_beamline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ NOTE: for these tutorials we will use your personal GitHub Account to store ever
4242

4343
## Steps
4444

45-
1. Make sure you have activated the python virtual environment and that `copier` is installed. See instructions here: {any}`ec`.
45+
1. Make sure you have activated the python virtual environment and that `copier` is installed. See instructions here: {any}`copier`.
4646

4747
1. Use copier to copy the services template repository to a new repository named `t01-services`. Note that there are two services templates, one for local deployments (using docker compose) and one for deployments to Kubernetes. We will use the local deployment template here.
4848

docs/tutorials/create_ioc.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The config folder can contain a variety of different files [as listed here](http
126126

127127
Each `entity` listed in the *IOC yaml* file will create an instance of the support module `entity_model` that it refers to. It will pass a number of arguments to the `entity_model` that will be used to generate the startup script entries and EPICS Database entries for that entity. The `entity_model` is responsible for declaring the parameters it expects and how they are used in the script and DB entries it generates. It supplies types and descriptions for each of these parameters, plus may supply default values.
128128

129-
We will be creating a simulation detector from the `ioc-adsimdetector` Generic IOC. The following *Support yaml* for the simulation detector is baked into the container. Once you have your container up and running you can use `ec exec bl01t-ea-cam-01 bash` to get a shell inside and see this file at **/epics/ibek_defs/ADSimDetector.ibek.support.yaml**.
129+
We will be creating a simulation detector from the `ioc-adsimdetector` Generic IOC. The following *Support yaml* for the simulation detector is baked into the container. Once you have your container up and running you can use `dc exec bl01t-ea-cam-01 bash` to get a shell inside and see this file at **/epics/ibek_defs/ADSimDetector.ibek.support.yaml**.
130130

131131
```yaml
132132
# yaml-language-server: $schema=https://github.com/epics-containers/ibek/releases/download/3.0.1/ibek.support.schema.json
@@ -299,7 +299,7 @@ We can launch all the services in the beamline as we did in the earlier tutorial
299299
```bash
300300
cd t01-services
301301
source ./environment.sh
302-
ec up -d
302+
dc up -d
303303
```
304304

305305
The new screen will allow you to hit 'Acquire' on the CAMERA pane, and 'Enable' on the Standard Array pane. You should see the moving image from the simulation detector in the right hand image pane.
@@ -384,7 +384,7 @@ Fill out the rest of your NDProcess entity as follows:
384384
Now restart your simulation detector IOC:
385385

386386
```bash
387-
ec restart bl01t-ea-cam-01
387+
dc restart bl01t-ea-cam-01
388388
```
389389

390390
Once it is back up you can click on the bl01t-ea-cam-01 button in the 'Autogenerated Engineering Screens' pane and you will see a new 'NDProcess' entity. If you know about wiring up AreaDetector you can now wire this plugin into your pipeline and make modifications to the image data as it passes through.
@@ -400,7 +400,7 @@ folder. Or alternatively you could override behaviour completely by placing
400400
To see what ibek generated you can go and look inside the IOC container:
401401

402402
```bash
403-
ec exec bl01t-ea-test-02
403+
dc exec bl01t-ea-test-02
404404
cd /epics/runtime/
405405
cat ioc.subst
406406
cat st.cmd
@@ -431,7 +431,7 @@ Your IOC Instance will now be using the raw startup script and database. But sho
431431

432432
Restart the IOC to see it operating as before (except that engineering screen generation will no longer happen):
433433
```bash
434-
ec restart bl01t-ea-cam-01
434+
dc restart bl01t-ea-cam-01
435435
```
436436

437437
:::{note}

docs/tutorials/debug_generic_ioc.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Comment out the apt-install line like this:
3434
```
3535

3636
Now rebuild the container - do this command from a new terminal *outside* of
37-
the devcontainer (make sure you have `ec` installed):
37+
the devcontainer:
3838

3939
```bash
4040
# for docker users - builkit complicates debugging at present
@@ -61,8 +61,7 @@ compilation terminated.
6161

6262
When a container build fails the container image is created up to the point
6363
where the last successful Dockerfile command was run. This means that we can
64-
investigate the build failure by running a shell in the container. `ec`
65-
provides us with the following convenience command to do this:
64+
investigate the build failure by running a shell in the container.
6665

6766
- scroll up the page until you see the last successful build step e.g.
6867

docs/tutorials/deploy_example.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ have followed the instructions in the previous tutorial correctly.
4141

4242
Make sure you have a terminal open and the current working directory is your `t01-services` project root folder.
4343

44-
The standard way to set up your environment for any ec services repository is to source the environment.sh script from the root of the services repo. i.e.
44+
The standard way to set up your environment for any epics-containers services repository is to source the environment.sh script from the root of the services repo. i.e.
4545

4646
```bash
4747
source ./environment.sh
@@ -80,23 +80,23 @@ You can see the status of the services by running the following command:
8080
docker compose ps
8181
```
8282

83-
In environment.sh we created an alias for `docker compose` named `ec` from now on we'll shorten the commands to use `ec` instead of `docker compose`.
83+
In environment.sh we created an alias for `docker compose` named `dc` from now on we'll shorten the commands to use `dc` instead of `docker compose`.
8484

8585
## Managing the Example IOC Instance
8686

8787
### Starting and Stopping IOCs
8888

89-
To stop / start the example IOC try the following commands. Note that `ec ps -a` shows you all IOCs including stopped ones.
89+
To stop / start the example IOC try the following commands. Note that `dc ps -a` shows you all IOCs including stopped ones.
9090

9191
Also note that tab completion should allow you to complete the names of your commands and services. e.g.
92-
`ec star <tab> ex <tab>`, should complete to `ec start example-test-01`.
92+
`dc star <tab> ex <tab>`, should complete to `dc start example-test-01`.
9393

9494
```bash
95-
ec ps -a
96-
ec stop example-test-01
97-
ec ps -a
98-
ec start example-test-01
99-
ec ps
95+
dc ps -a
96+
dc stop example-test-01
97+
dc ps -a
98+
dc start example-test-01
99+
dc ps
100100
```
101101

102102
:::{Note}
@@ -112,7 +112,7 @@ This is a Generic IOC image and all IOC Instances must be based upon one of thes
112112
To run a bash shell inside the IOC container:
113113

114114
```bash
115-
ec exec example-test-01 bash
115+
dc exec example-test-01 bash
116116
caget EXAMPLE:SUM
117117
```
118118

@@ -138,13 +138,13 @@ In the Virtual Machine supplied for testing epics-containers we do not install E
138138
To get the current logs for the example IOC:
139139

140140
```bash
141-
ec logs example-test-01
141+
dc logs example-test-01
142142
```
143143

144144
Or follow the IOC log until you hit ctrl-C:
145145

146146
```bash
147-
ec logs example-test-01 -f
147+
dc logs example-test-01 -f
148148
```
149149

150150
You should see the log of ibek loading and generating the IOC startup assets and then the ioc shell startup script log. Ibek is the tool that runs inside of the IOC container and generates the ioc shell script and database file by interpreting the /epics/ioc/config/ioc.yaml at launch time.
@@ -154,7 +154,7 @@ You should see the log of ibek loading and generating the IOC startup assets and
154154
You can stop all the services with the following command.
155155

156156
```bash
157-
ec stop
157+
dc stop
158158
```
159159

160160
This will stop all the currently running containers described in the `compose.yml` file.
@@ -166,7 +166,7 @@ However this will leave the resources themselves in place:
166166
To take down the services and remove all of their resources use the following command:
167167

168168
```bash
169-
ec down
169+
dc down
170170
```
171171

172172
### Monitoring and interacting with an IOC shell
@@ -177,7 +177,7 @@ shell. In the next tutorial we will use this command to interact with
177177
iocShell.
178178

179179
```bash
180-
ec attach example-test-01
180+
dc attach example-test-01
181181
dbl
182182
# ctrl-p ctrl-q to detach
183183
```

docs/tutorials/dev_container.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This means making changes to the IOC instance folders which appear in the `servi
2323
To make a change like this requires:
2424

2525
- change the IOC instance ioc.yaml or other configuration files in the services repository
26-
- re-launch the IOC with `ec restart <ioc-name>`
26+
- re-launch the IOC with `dc restart <ioc-name>`
2727
- that's it. No compilation required because we are only changing instance configuration here, not the IOC binary or dbd.
2828

2929
(changes_2)=
@@ -43,7 +43,7 @@ To make a change like this requires:
4343
- make changes to the Generic IOC Dockerfile (which holds the build instructions for a Generic IOC - we will discuss this in {any}`generic_ioc`)
4444
- push the changes and tag the repo - this will build and publish a new container image using CI
4545
- change the IOC instance in the services repo to point at the new container image
46-
- redeploy the IOC with `ec restart <ioc-name>`
46+
- redeploy the IOC with `dc restart <ioc-name>`
4747

4848

4949
(changes_3)=
@@ -130,7 +130,7 @@ Before continuing this tutorial make sure you have not left any IOCs running fro
130130
```bash
131131
cd t01-services
132132
. ./environment.sh
133-
ec down
133+
dc down
134134
```
135135
:::
136136

docs/tutorials/dev_container2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ IMPORTANT: the commands we are about to run must be executed on the host, not in
5151
```bash
5252
cd /workspaces/ioc-adsimdetector/compose
5353
. ./environment.sh
54-
ec up -d
54+
dc up -d
5555
```
5656

5757
Phoebus will be launched and attempt to load the bob file called **opi/ioc/index.bob**. The **opi** folder is a place where the author of this generic IOC could place some screens. The subfolder **ioc** is not committed to git and is where the IOC instance will place its autogenerated engineering screens. The autogenerated screens always include and index.bob which is the entry point to all other autogenerated screens.

docs/tutorials/generic_ioc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,6 @@ https://github.com/orgs/YOUR_GITHUB_ACCOUNT/packages?repo_name=ioc-lakeshore340
708708
709709
## EXERCISE
710710
711-
Now you have a published Generic IOC container image for ioc-lakeshore340. See if you can add an IOC instance that uses this into your `bl01t` beamline. You should then be able to run up your IOC instance with `ec deploy-local`. You could also run a local version of the simulator and see if you can get the IOC to talk to it.
711+
Now you have a published Generic IOC container image for ioc-lakeshore340. See if you can add an IOC instance that uses this into your `bl01t` beamline. You should then be able to run up your IOC instance with `dc deploy-local`. You could also run a local version of the simulator and see if you can get the IOC to talk to it.
712712
713713

docs/tutorials/ioc_changes1.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ git tag 2024.8.2
6363
git push origin 2024.8.2
6464
```
6565

66-
If you like working entirely from the vscode window you can open a terminal in vscode *outside* of the devcontainer. To do so, press `Ctrl-Shift-P` and choose the commnd `Terminal: Create New Integrated Terminal (Local)`. This will open a terminal to the host. You can then run `ec` from there.
66+
If you like working entirely from the vscode window you can open a terminal in vscode *outside* of the devcontainer. To do so, press `Ctrl-Shift-P` and choose the commnd `Terminal: Create New Integrated Terminal (Local)`. This will open a terminal to the host. You can then run docker compose from there.
6767

6868
## Launching the Test Beamline
6969

@@ -76,20 +76,20 @@ Make sure the ca-gateway from the previous tutorial is stopped before launching
7676
# IMPORTANT: do this in a terminal outside of the devcontainer
7777
cd ioc-adsimdetector/compose
7878
. ./environment.sh
79-
ec down
79+
dc down
8080
```
8181

82-
Now you can launch your test beamline and it will have picked up the new extras.db.
82+
Now you can launch your test beamline and it will have picked up the new extras.db. Note that we run caget inside the IOC container because not all users will have caget on their host. Those that have it on the host can just type: `caget BL01T-EA-CAM-01:TEST`.
8383

8484
```bash
8585
# IMPORTANT: do this in a terminal outside of the devcontainer
8686
cd t01-services
8787
. ./environment.sh
88-
ec up -d
89-
caget BL01T-EA-CAM-01:TEST
88+
dc up -d
89+
dc exec example-test-01 caget BL01T-EA-CAM-01:TEST
9090

9191
# Now shut down the beamline again so we can continue with further developer container tutorials
92-
ec down
92+
dc down
9393
```
9494

9595
## Raw Startup Assets

docs/tutorials/ioc_changes2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ From *outside of the developer container* start up phoebus and the ca-gateway as
7373
```bash
7474
cd ioc-adsimdetector/compose
7575
. ./environment.sh
76-
ec up -d
76+
dc up -d
7777
```
7878

7979
Phoebus should now be up and running and showing the auto generated **index.bob**, In phoebus do the following steps:

docs/tutorials/setup_workstation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ python3 -m pip install --upgrade pip
200200

201201
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).
202202

203-
(ec)=
203+
(copier)=
204204

205205
### copier
206206

0 commit comments

Comments
 (0)