move i15-1 to i15

Author: gilesknap

Dockerfile

@@ -1,6 +1,6 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
-ARG PYTHON_VERSION=3.12
+ARG PYTHON_VERSION=3.12-bookworm
 FROM python:${PYTHON_VERSION} AS developer
 
 # Add any system dependencies for the developer/build environment here

src/deploy_tools/demo_configuration/ec/i15-1.yaml renamed to src/deploy_tools/demo_configuration/ec/i15.yaml

@@ -2,21 +2,21 @@
 
 module:
   name: ec
-  version: i15-1
-  description: ec command line tool configured for i15-1
+  version: i15
+  description: ec command line tool configured for i15
   allow_updates: true
 
   dependencies:
     - name: edge-containers-cli
-    - name: k8s-i15-1
+    - name: k8s-i15
       version: local
 
   env_vars:
     - name: EC_TARGET
-      value: i15-1-beamline/i15-1
+      value: i15-beamline/i15
     - name: EC_K8S_NAMESPACE
-      value: i15-1-beamline
+      value: i15-beamline
     - name: EC_SERVICES_REPO
-      value: https://gitlab.diamond.ac.uk/controls/containers/beamline/i15-1-services.git
+      value: https://gitlab.diamond.ac.uk/controls/containers/beamline/i15-services.git
 
   applications: []

src/deploy_tools/demo_configuration/make-beamlines.py

@@ -38,7 +38,7 @@
     {"i13": ["k8s-i13", gl]},
     {"i13-1": ["k8s-i13-1", gl]},
     {"i14": ["k8s-i14", gl]},
-    {"i15-1": ["k8s-i15-1", gl]},
+    {"i15": ["k8s-i15", gl]},
     {"i16": ["k8s-i16", gl]},
     {"i18": ["k8s-i18", gl]},
     {"i19": ["k8s-i19", gl]},