Skip to content

Commit 7caab4a

Browse files
author
Derek Hower
committed
Check for devcontainer environment, skip singularity
1 parent 7090362 commit 7caab4a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"remoteEnv": {
77
"DISPLAY": ":0"
88
},
9+
"containerEnv": {
10+
"DEVCONTAINER_ENV": "true"
11+
},
912
// vscode extensions
1013
"customizations": {
1114
"vscode": {

do

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/bin/bash
22

33
ROOT=$(dirname $(realpath $BASH_SOURCE[0]))
4-
source $ROOT/bin/setup
4+
if [ -v DEVCONTAINER_ENV ]; then
5+
BUNDLE=bundle
6+
else
7+
source $ROOT/bin/setup
8+
fi
59

610
# really long way of invoking rake, but renamed to 'do'
711
$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@

0 commit comments

Comments
 (0)