Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for august tutorials review #49

Merged
merged 6 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 3.6.1b1
_commit: 3.6.1-4-g736b7c7
_src_path: gh:epics-containers/ioc-template
description: The simulation AreaDetector
git_platform: github.com
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
},
"remoteEnv": {
// provides a name for epics-containers to use in bash prompt etc.
"EC_PROJECT": "${localWorkspaceFolderBasename}"
"EC_PROJECT": "${localWorkspaceFolderBasename}",
"EPICS_CA_AUTO_ADDR_LIST": "NO",
"EPICS_CA_ADDR_LIST": "127.0.0.1"
},
"features": {
// add quality of life features for developers including git config integration
Expand Down
5 changes: 3 additions & 2 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ cd $(dirname ${0})

# use docker if available else use podman
if ! docker version &>/dev/null; then docker=podman; else docker=docker; fi
if $docker buildx version &>/dev/null; then builx=buildx; load=--load; fi
if $docker buildx version &>/dev/null; then buildx=buildx; load=--load ; fi
if [[ $DOCKER_BUILDKIT == "0" ]]; then buildx=; load=; fi

# make sure new repos get their submodule ibek-support
if [ ! -d ibek-support/_global ] ; then git submodule update --init ; fi

# build and developer images
set -x
$docker build $buildx -t ${TAG} "${@}" $load \
$docker $buildx build -t ${TAG} "${@}" $load \
--build-arg IMAGE_EXT=$IMAGE_EXT \
$runtime --target $TARGET .
2 changes: 2 additions & 0 deletions compose/services/phoebus/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ services:
- /tmp/.X11-unix:/tmp/.X11-unix
- ~/.Xauthority:/root/.Xauthority
- ../../../opi:/opi
- ../../../..:/workspaces

# for X11 to work we need to run as the same UID as the host
# IMPORTANT: set UIDGID to your host user:group e.g. 1000:1000
# BUT: always to 0:0 if you are using podman
Expand Down
2 changes: 1 addition & 1 deletion ioc/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ description='
startup script. The file name should always be 'ioc.yaml'. The ioc instance
can determine its own name with the following as the first line in 'ioc.yaml'

ioc_name: ""{{ __utils__.get_env('IOC_NAME') }}""
ioc_name: ""{{ _global.get_env('IOC_NAME') }}""

at the top of the file and in turn "{{ ioc_name }}"" can be used in any
of the fields within the file. For example: by default Kubernetes will be
Expand Down
17 changes: 13 additions & 4 deletions services/bl01t-ea-ioc-02/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2024.1.1/ibek.ioc.schema.json
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2024.8.2/ibek.ioc.schema.json

ioc_name: "{{ _global.get_env('IOC_NAME') }}"

Expand All @@ -10,16 +10,25 @@ entities:
value: GMT0BST

- type: devIocStats.iocAdminSoft
IOC: '{{ ioc_name | upper }}'
IOC: "{{ ioc_name | upper }}"

- type: ADSimDetector.simDetector
PORT: DET.DET
P: BL01T-EA-TST-02
R: ':DET:'
R: ":DET:"

- type: ADCore.NDPvaPlugin
PORT: DET.PVA
PVNAME: BL01T-EA-TST-02:PVA:OUTPUT
P: BL01T-EA-TST-02
R: ':PVA:'
R: ":PVA:"
NDARRAY_PORT: DET.DET

- type: ADCore.NDStdArrays
PORT: DET.ARR
P: BL01T-EA-TST-02
R: ":ARR:"
NDARRAY_PORT: DET.DET
TYPE: Int8
FTVL: CHAR
NELEMENTS: 1310720
2 changes: 1 addition & 1 deletion services/bl01t-ea-ioc-02/values.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.2.2
image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.8.2