Skip to content

Commit

Permalink
upate to latest framework
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Jan 26, 2024
1 parent 5895085 commit eb38520
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
25 changes: 14 additions & 11 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
"EC_PROJECT": "${localWorkspaceFolderBasename}"
},
"features": {
// add quality of life features for developers including git config integration
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": false,
"installOhMyZsh": false,
"installOhMyZshConfig": false,
// don't upgrade to make this similar to the runtime container
"upgradePackages": false
}
},
// IMPORTANT for this devcontainer to work with docker EC_REMOTE_USER must be
// set to vscode. For podman it should be left blank.
// set to vscode. You will run as vscode with full sudo rights.
// For podman it should be left blank. You will run as root but host mounts
// will be owned by your user.
"remoteUser": "${localEnv:EC_REMOTE_USER}",
"customizations": {
"vscode": {
Expand All @@ -34,7 +35,7 @@
"redhat.vscode-yaml",
"ryanluker.vscode-coverage-gutters",
"epicsdeb.vscode-epics",
"ms-python.black-formatter"
"charliermarsh.ruff"
]
}
},
Expand All @@ -47,15 +48,17 @@
"runArgs": [
// Allow the container to access the host X11 display and EPICS CA
"--net=host",
// Make sure SELinux does not disable with access to host filesystems like tmp
// Make sure SELinux does not disable write access to host filesystems like tmp
"--security-opt=label=disable"
],
"workspaceMount": "source=${localWorkspaceFolder},target=/epics/${localWorkspaceFolderBasename},type=bind",
"workspaceFolder": "/epics/${localWorkspaceFolderBasename}",
// Mount the parent of the project folder so we can access peer projects
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
// mount in other useful files from the host
"mounts": [
// Mount some useful local files from the user's home directory
// By mounting the parent of the workspace we can work on multiple peer projects
"source=${localWorkspaceFolder}/../,target=/repos,type=bind",
// we also mount the project folder into a know location in the container
// this is where the ibek-support and ioc folders reside in the container build
// in this way the devcontainer and runtime look very similar
"source=${localWorkspaceFolder},target=/epics/generic-source,type=bind",
// this provides eternal bash history in and out of the container
"source=${localEnv:HOME}/.bash_eternal_history,target=/root/.bash_eternal_history,type=bind",
// this bashrc hooks up the .bashrc_dev_container in the following mount
Expand Down
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ ibek
# dont save workspaces as other users will have differing folders
*workspace

# ignore output folders of epics builds
**/O.*
ioc/bin
ioc/lib
# config folder is there to be replaced there is just a dummy with Readme.
ioc/config
2 changes: 1 addition & 1 deletion ibek-support
Submodule ibek-support updated 52 files
+18 −0 ADAravis/ADAravis.ibek.support.yaml
+99 −0 ADAravis/arvFeature.pvi.device.yaml
+2 −1 ADAravis/install.sh
+122 −0 ADCore-slim/ADCore.ibek.support.yaml
+300 −0 ADCore-slim/ADDriver.pvi.device.yaml
+176 −0 ADCore-slim/NDPluginDriver.pvi.device.yaml
+4 −0 ADCore-slim/NDPluginFile.pvi.device.yaml
+14 −0 ADCore-slim/NDPluginPva.pvi.device.yaml
+273 −0 ADCore-slim/asynNDArrayDriver.pvi.device.yaml
+63 −0 ADCore-slim/install.sh
+20 −0 ADCore/ADCore.ibek.support.yaml
+297 −288 ADCore/ADDriver.pvi.device.yaml
+2 −0 ADCore/NDFileHDF5.pvi.device.yaml
+336 −0 ADCore/NDPluginProcess.pvi.device.yaml
+14 −0 ADCore/NDPluginPva.pvi.device.yaml
+270 −0 ADCore/NDPluginROI.pvi.device.yaml
+579 −0 ADCore/NDPluginStats.pvi.device.yaml
+3 −186 ADCore/asynNDArrayDriver.pvi.device.yaml
+2 −1 ADCore/install.sh
+5,205 −0 ADGenICam/ADGenICam.pvi.device.yaml
+1,347 −0 ADGenICam/GenICamFeature.pvi.device.yaml
+2 −1 ADGenICam/install.sh
+64 −0 ADSample/ADSimDetector.ibek.support.yaml
+27 −0 ADSample/install.sh
+297 −0 ADSample/simDetector.pvi.device.yaml
+5 −0 ADSimDetector/ADSimDetector.ibek.support.yaml
+2 −1 ADSimDetector/install.sh
+293 −295 ADSimDetector/simDetector.pvi.device.yaml
+35 −0 StreamDevice/install.sh
+1 −1 _global/epics.ibek.support.yaml
+27 −119 asyn/asyn.ibek.support.yaml
+3 −2 asyn/install.sh
+2 −1 autosave/install.sh
+7 −0 build_support.sh
+6 −1 busy/install.sh
+3 −2 calc/install.sh
+2 −1 iocStats/install.sh
+33 −0 lakeshore340/install.sh
+68 −0 lakeshore340/lakeshore340.ibek.support.yaml
+83 −0 modbus/README.md
+38 −0 modbus/install.sh
+272 −0 modbus/modbus.ibek.support.yaml
+3 −3 motor/install.sh
+48 −61 motor/motor.ibek.support.yaml
+28 −0 motorMotorSim/install.sh
+123 −0 motorMotorSim/motorMotorSim.ibek.support.yaml
+10 −4 opcua/install.sh
+2 −1 pmac/install.sh
+2,243 −0 pmac/pmac.ibek.support.todo
+420 −2,988 pmac/pmac.ibek.support.yaml
+83 −0 pvi-generate.sh
+2 −1 sscan/install.sh
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ibek==1.5.4
ibek==1.6.2
# to install direct from github during development in the dev branch:
#git+https://github.com/epics-containers/ibek.git@dev
2 changes: 1 addition & 1 deletion requirements_ec.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
epics-containers-cli==2.6.9
epics-containers-cli==2.7.0
# to install direct from github during development in the dev branch:
#git+https://github.com/epics-containers/epics-containers-cli.git@dev

0 comments on commit eb38520

Please sign in to comment.