Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a single space character and nothing more. #46

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
sudo: required

language: python
language: python

services:
- docker

before_install:
- docker pull craigrhodes/fs_site
- service mysql stop

script:
- docker run craigrhodes/fs_site -e "FS_PORT=8000" -p 8000:8000 ./docker_test.sh
script:
- docker run -e "FS_PORT=8000" -v "$(pwd):/usr/src/fs_site" -p 8000:8000 craigrhodes/fs_site ./docker_test.sh
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ This is a web application developed for an assignment in Advanced Software Engin
Freesources aims to create database of free items for public use that is contributed to and maintained by users.

**Docker**
This project is using docker for a consistent development environment.
This project is using docker for a consistent development environment.

The image is hosted on dockerhub at https://hub.docker.com/r/craigrhodes/fs_site/ -- the repository is craigrhodes/fs_site.

Expand Down
8 changes: 7 additions & 1 deletion docker_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

# NOTE: THIS FILE IS INTENDED TO BE USED BY THE DOCKER INSTANCE ONLY

# Stop mysql service if running
service mysql stop
rm -f /var/lib/mysql/ib_logfile0
rm -f /var/lib/mysql/ib_logfile1
chown -R mysql:mysql /var/lib/mysql

# Start MySQL
service mysql start
service mysql restart

# Create DB
echo "DROP DATABASE FreeSource;" | mysql -u root --password=$FS_PASS 2>/dev/null
Expand Down