Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Aug 27, 2024
1 parent ce7ef9c commit 11e6c52
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
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.1-8-g40dbdee
_commit: 3.6.1-10-gbcd47f9
_src_path: gh:epics-containers/ioc-template
description: A test instantiation of the ioc-template copier template
git_platform: github.com
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ibek-support"]
path = ibek-support
url = https://github.com/epics-containers/ibek-support
url = https://github.com/epics-containers/ibek-support.git
5 changes: 3 additions & 2 deletions compose/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ fi
function check_docker {
# return 0 if docker is detected, or 1 otherwise,
# cope with the possibility that podman is aliased to docker
if [[ $(docker version) =~ "Podman" ]]&> /dev/null; then
return 1
if [[ $(docker version) =~ "Docker" ]]&> /dev/null; then
return 0
fi
return 1
}

if check_docker; then
Expand Down
1 change: 0 additions & 1 deletion ibek-support
Submodule ibek-support deleted from 2c1ca7

0 comments on commit 11e6c52

Please sign in to comment.