Skip to content

Commit 6b8e26d

Browse files
authored
Fix/builds (#665)
* fix: jq from source needs dependencies * modify centos repos if available * command escaping in shell * fix: line endings * more fixes for shell and fedora * fix accidental change
1 parent 0bfb349 commit 6b8e26d

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

neurodocker/cli/tests/sample-template-jq.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ binaries:
1717
ND_BAZ: '1234'
1818
ND_FOO: BAR
1919
instructions: |
20-
export DUMMY="dummy"
20+
echo "Installing from binaries"
2121
{%- if self.pkg_manager == "yum" %}
22-
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
23-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
22+
if ls /etc/yum.repos.d/CentOS-* >/dev/null 2>&1; then
23+
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
24+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*;
25+
fi
2426
{%- endif %}
2527
{{ self.install_dependencies() }}
2628
curl -fsSL --output /usr/local/bin/jq {{ self.urls[self.version]}}
@@ -53,10 +55,12 @@ source:
5355
ND_BAZ: '1234'
5456
ND_FOO: BAR
5557
instructions: |
56-
export DUMMY="dummy"
58+
echo "Building from source"
5759
{%- if self.pkg_manager == "yum" %}
58-
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
59-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
60+
if ls /etc/yum.repos.d/CentOS-* >/dev/null 2>&1; then
61+
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
62+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*;
63+
fi
6064
{%- endif %}
6165
{{ self.install_dependencies() }}
6266
mkdir jq

neurodocker/templates/_default.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ source:
1919
yum:
2020
- bzip2
2121
- ca-certificates
22-
- epel-release
2322
- unzip
2423
- glibc-langpack-en
2524
- glibc-locale-source

0 commit comments

Comments
 (0)