Skip to content

Commit de0c47b

Browse files
[travis] Update dockerfile.
1 parent fe9dc56 commit de0c47b

File tree

3 files changed

+3
-117
lines changed

3 files changed

+3
-117
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ before_install:
1111
- docker exec dyngb-trusty-test sudo git clone --recursive https://github.com/stack-of-tasks/dynamic_graph_bridge.git /catkin_ws_dyngb/src/dynamic_graph_bridge
1212

1313
script:
14-
- docker exec dyngb-trusty-test sudo sh -c "cd /catkin_ws_dyngb;. /opt/ros/indigo/setup.sh;catkin_make"
14+
- docker exec dyngb-trusty-test sudo sh -c "cd /catkin_ws_dyngb;. /opt/ros/indigo/setup.sh;. /home/ostasse/travis_custom/setup-opt-robotpkg.sh;catkin_make"

travis_custom/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
1010

1111
USER root
1212
ADD /travis_custom/sudoers.txt /etc/sudoers
13-
ADD /travis_custom/setup-opt-robotpkg.sh /home/docker/.bashrc
13+
ADD /travis_custom/setup-opt-robotpkg.sh /home/docker/setup-opt-robotpkg.sh
1414
RUN chmod 440 /etc/sudoers
1515

1616
USER docker

travis_custom/setup-opt-robotpkg.sh

Lines changed: 1 addition & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,4 @@
1-
# ~/.bashrc: executed by bash(1) for non-login shells.
2-
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
3-
# for examples
4-
5-
# If not running interactively, don't do anything
6-
case $- in
7-
*i*) ;;
8-
*) return;;
9-
esac
10-
11-
# don't put duplicate lines or lines starting with space in the history.
12-
# See bash(1) for more options
13-
HISTCONTROL=ignoreboth
14-
15-
# append to the history file, don't overwrite it
16-
shopt -s histappend
17-
18-
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
19-
HISTSIZE=1000
20-
HISTFILESIZE=2000
21-
22-
# check the window size after each command and, if necessary,
23-
# update the values of LINES and COLUMNS.
24-
shopt -s checkwinsize
25-
26-
# If set, the pattern "**" used in a pathname expansion context will
27-
# match all files and zero or more directories and subdirectories.
28-
#shopt -s globstar
29-
30-
# make less more friendly for non-text input files, see lesspipe(1)
31-
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
32-
33-
# set variable identifying the chroot you work in (used in the prompt below)
34-
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
35-
debian_chroot=$(cat /etc/debian_chroot)
36-
fi
37-
38-
# set a fancy prompt (non-color, unless we know we "want" color)
39-
case "$TERM" in
40-
xterm-color) color_prompt=yes;;
41-
esac
42-
43-
# uncomment for a colored prompt, if the terminal has the capability; turned
44-
# off by default to not distract the user: the focus in a terminal window
45-
# should be on the output of commands, not on the prompt
46-
#force_color_prompt=yes
47-
48-
if [ -n "$force_color_prompt" ]; then
49-
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
50-
# We have color support; assume it's compliant with Ecma-48
51-
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
52-
# a case would tend to support setf rather than setaf.)
53-
color_prompt=yes
54-
else
55-
color_prompt=
56-
fi
57-
fi
58-
59-
if [ "$color_prompt" = yes ]; then
60-
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
61-
else
62-
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
63-
fi
64-
unset color_prompt force_color_prompt
65-
66-
# If this is an xterm set the title to user@host:dir
67-
case "$TERM" in
68-
xterm*|rxvt*)
69-
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
70-
;;
71-
*)
72-
;;
73-
esac
74-
75-
# enable color support of ls and also add handy aliases
76-
if [ -x /usr/bin/dircolors ]; then
77-
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
78-
alias ls='ls --color=auto'
79-
#alias dir='dir --color=auto'
80-
#alias vdir='vdir --color=auto'
81-
82-
alias grep='grep --color=auto'
83-
alias fgrep='fgrep --color=auto'
84-
alias egrep='egrep --color=auto'
85-
fi
86-
87-
# some more ls aliases
88-
alias ll='ls -alF'
89-
alias la='ls -A'
90-
alias l='ls -CF'
91-
92-
# Add an "alert" alias for long running commands. Use like so:
93-
# sleep 10; alert
94-
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
95-
96-
# Alias definitions.
97-
# You may want to put all your additions into a separate file like
98-
# ~/.bash_aliases, instead of adding them here directly.
99-
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
100-
101-
if [ -f ~/.bash_aliases ]; then
102-
. ~/.bash_aliases
103-
fi
104-
105-
# enable programmable completion features (you don't need to enable
106-
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
107-
# sources /etc/bash.bashrc).
108-
if ! shopt -oq posix; then
109-
if [ -f /usr/share/bash-completion/bash_completion ]; then
110-
. /usr/share/bash-completion/bash_completion
111-
elif [ -f /etc/bash_completion ]; then
112-
. /etc/bash_completion
113-
fi
114-
fi
115-
1+
#!/bin/bash
1162
export ROBOTPKG_BASE=/opt/openrobots
1173
export PATH=$PATH:$ROBOTPKG_BASE/sbin:$ROBOTPKG_BASE/bin
1184
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROBOTPKG_BASE/lib:$ROBOTPKG_BASE/lib/plugin:$ROBOTPKG_BASE/lib64

0 commit comments

Comments
 (0)