Skip to content

Commit

Permalink
~/.docksalrc support
Browse files Browse the repository at this point in the history
- Added ~/.docksalrc - loaded by fin for both interactive and non-interactive sessions
- Moved aliases to ~/.bash_aliases
  • Loading branch information
lmakarov committed Dec 29, 2016
1 parent a7b1d9c commit 06d3408
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ RUN \
# Legacy Drush versions (6 and 7)
mkdir $HOME/drush6 && cd $HOME/drush6 && composer require drush/drush:6.* && \
mkdir $HOME/drush7 && cd $HOME/drush7 && composer require drush/drush:7.* && \
echo "alias drush6='$HOME/drush6/vendor/bin/drush'" >> $HOME/.bashrc && \
echo "alias drush7='$HOME/drush7/vendor/bin/drush'" >> $HOME/.bashrc && \
echo "alias drush8='/usr/local/bin/drush'" >> $HOME/.bashrc && \
echo "alias drush6='$HOME/drush6/vendor/bin/drush'" >> $HOME/.bash_aliases && \
echo "alias drush7='$HOME/drush7/vendor/bin/drush'" >> $HOME/.bash_aliases && \
echo "alias drush8='/usr/local/bin/drush'" >> $HOME/.bash_aliases && \
# Drush modules
drush dl registry_rebuild --default-major=7 --destination=$HOME/.drush && \
drush cc drush && \
Expand All @@ -237,6 +237,7 @@ RUN \
COPY config/.ssh $HOME/.ssh
COPY config/.drush $HOME/.drush
COPY config/.zpreztorc $HOME/.zpreztorc
COPY config/.docksalrc $HOME/.docksalrc
COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY startup.sh /opt/startup.sh

Expand Down
13 changes: 13 additions & 0 deletions config/.docksalrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Commands in this file will be sourced for both interactive and non-interactive sessions.

# Allow alias expansion in non-interactive shells.
shopt -s expand_aliases

# NVM initialization.
export NVM_DIR="/home/docker/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm

# Source alias definitions.
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi

0 comments on commit 06d3408

Please sign in to comment.