Skip to content

Commit bc88613

Browse files
committed
remove reference to creating network in environment.sh
For some reason podman does not like this and the ca-gateway fails to work. We might want some way of co-existing with devcontainer but for now just deal with that not being possible (for podman)
1 parent 6d4055c commit bc88613

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v4.6.0
44
hooks:
55
- id: check-added-large-files
66
- id: check-yaml

docs/tutorials/deploy_example.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ source ./environment.sh
4848
```
4949

5050
The environment file is the same for all local deployment services projects and sets up the following. The defaults supplied are all intended for developer workstation use:-
51-
52-
- **UIDGID** Used to set which account and group containers are launched with. This is always 0:0 for podman and USERID:GROUPID for docker. Only required for developer workstations.
53-
- **COMPOSE_PROFILES** Determines which compose profile is launched. Defaults to the 'develop' profile intended for developer workstations. It runs a ca-gateway container that publishes PVs on localhost and a container for phoebus to provide an OPI.
54-
- **EPICS_CA_ADDR_LIST** Set to localhost so that host caget's can see the containerised IOC PVs on a developer workstation.
51+
- sets permissions on **xhost** to allow local containers to display GUIs on the host.
52+
- sets **UIDGID** which is used to set which account and group the phoebus container is launched with. This is always 0:0 for podman and USERID:GROUPID for docker. Only required for developer workstations.
53+
- sets **COMPOSE_PROFILES** which determines which compose profile is launched. Defaults to the 'test' profile intended for testing on developer workstations. It runs a ca-gateway container that publishes PVs on localhost and a container for phoebus to provide an OPI.
54+
- sets **EPICS_CA_ADDR_LIST** to localhost so that host can see the containerised IOC PVs on a developer workstation.
5555

5656

5757
(deploy-example-instance)=

0 commit comments

Comments
 (0)