这是indexloc提供的服务,不要输入任何密码
Skip to content
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
4 changes: 3 additions & 1 deletion plugins/docker-options/functions
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ get_phases() {
local phase
local passed_phases
if [[ -n "$passed_phases_list" ]]; then
IFS=',' read -ra passed_phases <<< "$passed_phases_list"
OIFS=$IFS; IFS=','
read -ra passed_phases <<< "$passed_phases_list"
IFS=$OIFS
for phase in "${passed_phases[@]}"; do
[[ "$phase" = @($phases_allowed) ]] || dokku_log_fail "Phase(s) must be one of [${AVAILABLE_PHASES[*]}]"
done
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/parallel_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ setup_circle() {
sudo -E make -e setup-deploy-tests
make -e ci-dependencies
# circleci runs Ubuntu 12.04 and thus a previous version of bash (4.2) than 14.04
sudo apt-get install -y -q "bash=$(apt-cache show bash | egrep "^Version: 4.3" | head -1 | awk -F: '{ print $2 }' | xargs)"
# sudo apt-get install -y -q "bash=$(apt-cache show bash | egrep "^Version: 4.3" | head -1 | awk -F: '{ print $2 }' | xargs)"
bash --version
docker version
# setup .dokkurc
Expand Down