Skip to content

Commit

Permalink
Fix broken Docker changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Shamal Faily committed Jan 17, 2017
1 parent 5b1e82f commit 8660134
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
5 changes: 0 additions & 5 deletions docker/.profile

This file was deleted.

1 change: 0 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ENV PYTHONPATH=/cairis
RUN mkdir /images
RUN git clone https://github.com/failys/cairis /cairis
COPY cairis.cnf /
COPY .profile /
RUN service mysql start && /cairis/cairis/test/initdb.sh
RUN service mysql start && ./cairis/cairis/bin/add_cairis_user.py test test
EXPOSE 7071
Expand Down
6 changes: 5 additions & 1 deletion docker/cmd.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash
set -e
. .profile
service mysql start
mysql -h localhost -u root <<!
set global max_sp_recursion_depth = 255;
flush tables;
flush privileges;
!
/cairis/cairis/bin/cairisd.py runserver

0 comments on commit 8660134

Please sign in to comment.