Skip to content

Commit e8ad7fc

Browse files
authored
Merge pull request #31 from sourceboat/feature/25-move-scripts-to-root
#25 Move scripts to root
2 parents c6903c5 + f2db499 commit e8ad7fc

File tree

7 files changed

+25
-27
lines changed

7 files changed

+25
-27
lines changed

Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,12 @@ RUN composer global require hirak/prestissimo
9898
RUN yarn config set strict-ssl false && \
9999
yarn global add cross-env
100100

101-
# copy home folder and make run scripts executable
102-
COPY ./home/app/ /home/app/
103-
COPY ./root/.bashrc /root/
104-
RUN find /home/app -name "run-*.sh" -exec chmod -v +x {} \;
105-
RUN chmod +x /home/app/entrypoint.sh
101+
# copy root folder and make run scripts executable
102+
COPY ./root/ /root/
103+
RUN find /root -name "run-*.sh" -exec chmod -v +x {} \;
104+
RUN chmod +x /root/entrypoint.sh
106105

107106
# run the application
108-
ENTRYPOINT ["/home/app/entrypoint.sh"]
109-
CMD /home/app/run-prod.sh
107+
ENTRYPOINT ["/root/entrypoint.sh"]
108+
CMD /root/run-prod.sh
110109
EXPOSE 8080

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ version: '3.7'
4545
services:
4646
app:
4747
build: .
48-
command: /home/app/run-dev.sh
48+
command: /root/run-dev.sh
4949
restart: unless-stopped
5050
environment:
5151
- PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
@@ -80,7 +80,7 @@ version: '3.7'
8080
services:
8181
app:
8282
image: sourceboat/docker-laravel
83-
command: /home/app/run-prod.sh
83+
command: /root/run-prod.sh
8484
restart: unless-stopped
8585
environment:
8686
- PHP_OPCACHE_VALIDATE_TIMESTAMPS=1

home/app/.bashrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

root/.bashrc

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
source /home/app/.bashrc
1+
# useful aliases
2+
alias ll='ls -la'
3+
alias artisan="php artisan"
4+
5+
# prompt colors and short user display
6+
force_color_prompt=yes
7+
PS1='\[\033[1;36m\]\u\[\033[1;31m\]\[\033[1;32m\]:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] '
8+
9+
# artisan autocompletion
10+
_artisan()
11+
{
12+
COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
13+
COMMANDS=`artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"`
14+
COMPREPLY=(`compgen -W "$COMMANDS" -- "${COMP_WORDS[COMP_CWORD]}"`)
15+
return 0
16+
}
17+
complete -F _artisan artisan
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)