More pedantry

This commit is contained in:
Jan Tuomi
2017-02-24 16:31:31 +02:00
parent 97e05316ae
commit 878bca0eba
+22 -20
View File
@@ -1,16 +1,33 @@
# SIKWEB 2.0
## Installation with docker
## Accessing the source
### Installing docker
### Clone this repository and enter it
Install docker and docker-compose. On ubuntu this can be done with
Set up your SSH key authentication in GitLab Profile Settings. Then clone the repository:
```
git clone git@sika.sahkoinsinoorikilta.fi:vtmk/web2.0.git
cd web2.0
```
Change to the development branch:
```
git checkout develop
```
## Installation with Docker
### Installing Docker
Install docker and docker-compose. On Ubuntu this can be done with
```BASH
sudo apt-get install docker docker-compose
```
### Configuring db-image
### Configuring db image
```BASH
sudo docker-compose up db
@@ -40,7 +57,7 @@ Then CTRL-D away from Docker bash shell and shut down database image with CTRL-C
1. Copy settings-sample.py to settings.py in sikweb folder.
2. Configure at least the following settings
- dbsettings: use 'db' as host and correct user and password (configured above)
- DATABASES: use 'db' as host and use the same user and password as configured above
3. Run the following commands:
```BASH
@@ -66,21 +83,6 @@ NOTE: As your working directory (web2.0) is mounted by images, changes will be r
`virtualenv -p python3 virtualenv.sikweb`
### Clone this repository and enter it
Set up your SSH key authentication in GitLab Profile Settings. Then clone the repository:
```
git clone git@sika.sahkoinsinoorikilta.fi:vtmk/web2.0.git
cd web2.0
```
Change to the development branch:
```
git checkout develop
```
### Activate virtualenv (assuming we are at the root of this repository and virtualenv is one level above)
`. ../virtualenv.sikweb/bin/activate`