Skip to content

Commit 90f5abf

Browse files
committed
added postgres and better bash for docker exec
1 parent f3d279f commit 90f5abf

File tree

3 files changed

+108
-0
lines changed

3 files changed

+108
-0
lines changed

Changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.9.2 (release date: 2015-11-30)
2+
3+
* Added PostgreSQL Support
4+
* Added XTERM environment support w/colors
5+
16
## 0.9.1 (release date: 2015-10-07)
27

38
* Removed stale NTP entries

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ ADD build/default /etc/nginx/sites-available/default
3535
ADD build/nginx.conf /etc/nginx/nginx.conf
3636
ADD build/php-fpm.conf /etc/php5/fpm/php-fpm.conf
3737
ADD build/www.conf /etc/php5/fpm/pool.d/www.conf
38+
ADD build/.bashrc /root/.bashrc
3839

3940
# Add startup scripts for services
4041
ADD build/nginx.sh /etc/service/nginx/run
@@ -54,6 +55,9 @@ ADD build/index.php /var/www/public/index.php
5455
RUN chown -R www-data:www-data /var/www
5556
RUN chmod -R 755 /var/www
5657

58+
# Set terminal environment
59+
ENV TERM=xterm
60+
5761
# Port and settings
5862
EXPOSE 80
5963

build/.bashrc

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
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+
[ -z "$PS1" ] && return
7+
8+
# don't put duplicate lines in the history. See bash(1) for more options
9+
# ... or force ignoredups and ignorespace
10+
HISTCONTROL=ignoredups:ignorespace
11+
12+
# append to the history file, don't overwrite it
13+
shopt -s histappend
14+
15+
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
16+
HISTSIZE=1000
17+
HISTFILESIZE=2000
18+
19+
# check the window size after each command and, if necessary,
20+
# update the values of LINES and COLUMNS.
21+
shopt -s checkwinsize
22+
23+
# make less more friendly for non-text input files, see lesspipe(1)
24+
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
25+
26+
# set variable identifying the chroot you work in (used in the prompt below)
27+
if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
28+
debian_chroot=$(cat /etc/debian_chroot)
29+
fi
30+
31+
# set a fancy prompt (non-color, unless we know we "want" color)
32+
case "$TERM" in
33+
xterm-color) color_prompt=yes;;
34+
esac
35+
36+
# uncomment for a colored prompt, if the terminal has the capability; turned
37+
# off by default to not distract the user: the focus in a terminal window
38+
# should be on the output of commands, not on the prompt
39+
force_color_prompt=yes
40+
41+
if [ -n "$force_color_prompt" ]; then
42+
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
43+
# We have color support; assume it's compliant with Ecma-48
44+
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
45+
# a case would tend to support setf rather than setaf.)
46+
color_prompt=yes
47+
else
48+
color_prompt=
49+
fi
50+
fi
51+
52+
if [ "$color_prompt" = yes ]; then
53+
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
54+
else
55+
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
56+
fi
57+
unset color_prompt force_color_prompt
58+
59+
# If this is an xterm set the title to user@host:dir
60+
case "$TERM" in
61+
xterm*|rxvt*)
62+
PS1="\[\e[1;36m\]Docker|\[\e[0m\]$PS1"
63+
;;
64+
*)
65+
;;
66+
esac
67+
68+
# enable color support of ls and also add handy aliases
69+
if [ -x /usr/bin/dircolors ]; then
70+
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
71+
alias ls='ls --color=auto'
72+
#alias dir='dir --color=auto'
73+
#alias vdir='vdir --color=auto'
74+
75+
alias grep='grep --color=auto'
76+
alias fgrep='fgrep --color=auto'
77+
alias egrep='egrep --color=auto'
78+
fi
79+
80+
# some more ls aliases
81+
alias ll='ls -alF'
82+
alias la='ls -A'
83+
alias l='ls -CF'
84+
85+
# Alias definitions.
86+
# You may want to put all your additions into a separate file like
87+
# ~/.bash_aliases, instead of adding them here directly.
88+
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
89+
90+
if [ -f ~/.bash_aliases ]; then
91+
. ~/.bash_aliases
92+
fi
93+
94+
# enable programmable completion features (you don't need to enable
95+
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
96+
# sources /etc/bash.bashrc).
97+
#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
98+
# . /etc/bash_completion
99+
#fi

0 commit comments

Comments
 (0)