update readme

gilesknap · Jul 2, 2024 · 6540f75 · 6540f75
1 parent 3d91366
commit 6540f75
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 217 deletions.
diff --git a/README.md b/README.md
@@ -25,9 +25,17 @@ mkdir -p ~/.local/share/bash-completion/completions
 podman completion bash > ~/.local/share/bash-completion/completions/podman
 ```
 
+Some users who have set up podman sockets in the past may get errors with `module load docker-compose`. If you do then do the following and then re-run it.
+```bash
+/dls_sw/apps/setup-podman/setup.sh
+sed -i ~/.config/containers/containers.conf -e '/label=false/d' -e '/^\[containers\]$/a label=false'
+```
+
 ### Local Developer Environment
 To launch a development environment on a workstation, including phoebus:
 ```bash
+git clone [email protected]:gilesknap/bl01t.git
+cd bl01t
 alias ec='podman compose' # just for convenience
 export COMPOSE_PROFILES=develop UIDGID=0:0 EPICS_CA_ADDR_LIST=127.0.0.1
 ec up -d
@@ -50,7 +58,7 @@ ec exec bl01t-di-cam-01 bash
 # delete a service (deletes the container)
 ec down bl01t-di-cam-01
 # create and launch a single service (plus its dependencies)
-ec up bl01tt-di-cam-01 -d
+ec up bl01t-di-cam-01 -d
 ```
 
 ### Deploy To Beamline Servers

diff --git a/argo/.helmignore b/argo/.helmignore
diff --git a/argo/Chart.yaml b/argo/Chart.yaml
diff --git a/argo/templates/NOTES.txt b/argo/templates/NOTES.txt
diff --git a/argo/templates/_helpers.tpl b/argo/templates/_helpers.tpl
diff --git a/argo/templates/deployment.yaml b/argo/templates/deployment.yaml
diff --git a/argo/templates/service.yaml b/argo/templates/service.yaml
diff --git a/argo/values-production.yaml b/argo/values-production.yaml
diff --git a/argo/values.yaml b/argo/values.yaml
diff --git a/compose.yaml b/compose.yaml
@@ -16,8 +16,8 @@ include:
   - include/init.yml
 
   # all profiles
-  - services/bl01t-di-cam-01/compose.yml
   - services/bl01t-ea-test-01/compose.yml
+  - services/bl01t-di-cam-01/compose.yml
 
   # develop profile only
   - services/phoebus/compose.yml