update to new epics base with pvxs

epics-containers · Jan 8, 2025 · 2603647 · 2603647
1 parent 4c65088
commit 2603647
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,6 +14,25 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "(gdb) Attach to IOC",
+            "type": "cppdbg",
+            "request": "attach",
+            "program": "/epics/ioc/bin/linux-x86_64/ioc",
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Set Disassembly Flavor to Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ]
+        },
         {
             "name": "IOC devcontainer debug",
             "type": "cppdbg",

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_EXT
 
-ARG BASE=7.0.8ec2
+ARG BASE=7.0.8ec3b1
 ARG REGISTRY=ghcr.io/epics-containers
 ARG RUNTIME=${REGISTRY}/epics-base${IMAGE_EXT}-runtime:${BASE}
 ARG DEVELOPER=${REGISTRY}/epics-base${IMAGE_EXT}-developer:${BASE}
@@ -29,9 +29,6 @@ RUN sequencer/install.sh R2-2-9
 COPY ibek-support/iocStats/ iocStats
 RUN iocStats/install.sh 3.2.0
 
-COPY ibek-support/pvxs/ pvxs/
-RUN pvxs/install.sh 1.3.1
-
 COPY ibek-support/asyn/ asyn/
 RUN asyn/install.sh R4-44-2