From 480ecbf07be7df4a9aea5b0a384a44fff57f6a9c Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Mon, 2 Oct 2023 15:33:12 +0100
Subject: [PATCH] update to ibek 1.3.5

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 01b2330..7eab761 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,11 @@ ARG REGISTRY=ghcr.io/epics-containers
 
 FROM  ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer
 
+<<<<<<< HEAD
 # install latest ibek while in development - eventually will come from epics-base
+=======
+# Get latest ibek while in development. Will come from epics-base in futre.
+>>>>>>> f10acd9 (update to ibek 1.3.5)
 RUN pip install ibek==1.3.5
 
 # the devcontainer mounts the project root to /epics/ioc-adaravis
@@ -33,6 +37,7 @@ RUN ADCore/install.sh R3-12-1
 COPY ibek-support/ADAravis/ ADAravis/
 RUN ADAravis/install.sh R2-3
 
+# create IOC source tree, generate Makefile and compile IOC Instance
 RUN ibek ioc compile
 
 ##### runtime preparation stage ################################################