Skip to content

Commit

Permalink
Merge pull request #10 from epics-containers/dev
Browse files Browse the repository at this point in the history
Update to ec v2.6.0
  • Loading branch information
gilesknap authored Oct 27, 2023
2 parents 60329c9 + dc15fa4 commit fc5c1f9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"EC_PROJECT": "${localWorkspaceFolderBasename}"
},
"features": {
// adds standard common-utils features - see
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": false,
"installOhMyZsh": false,
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
export EC_TAG="--tag ${TAG:-latest}"
export EC_PLATFORM="--platform ${PLATFORM:-linux/amd64}"
export EC_CACHE="${CACHE:-/tmp/ec-cache}"
export EC_DEBUG=true
if [[ "${PUSH}" == 'true' ]] ; then EC_PUSH='--push' ; fi

THIS=$(dirname ${0})
Expand All @@ -35,7 +34,7 @@ export EC_CARGS="
# ec dev build --arch rtems ... for RTEMS cross compile

# build runtime and developer images
ec dev build --buildx ${EC_TAG} ${EC_PLATFORM} ${EC_PUSH} ${EC_CARGS}
ec -v dev build ${EC_TAG} ${EC_PLATFORM} ${EC_PUSH} ${EC_CARGS}

# extract the ioc schema from the runtime image
ec dev launch-local ${EC_TAG} --execute \
Expand Down
2 changes: 1 addition & 1 deletion ibek-support
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# TODO using dev for the moment. Should be a pin to the current release
git+https://github.com/epics-containers/epics-containers-cli.git@dev
epics-containers-cli==2.6.0
#git+https://github.com/epics-containers/epics-containers-cli.git@dev

0 comments on commit fc5c1f9

Please sign in to comment.