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

잡다한 오류 수정 #6

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bd44f13
Move parsing part to Module Code
Jun 7, 2018
8ca04cb
Update README.md
Jun 8, 2018
a96e6a7
Merge pull request #11 from kepler92/master
kwangsooshin Jun 8, 2018
0732126
Update README.md and Old database file delete bug fixed
Jun 18, 2018
329765a
Merge pull request #12 from kepler92/master
kwangsooshin Jun 18, 2018
550b1de
Set a Pagination and edit viewsets
Jun 29, 2018
1c420c8
Merge pull request #15 from kepler92/master
kwangsooshin Jun 29, 2018
f5998de
Docker-compose Test
kwangsooshin Jul 5, 2018
29964c6
Docker-compose Test
kwangsooshin Jul 5, 2018
711e247
Edit README.md
kwangsooshin Jul 5, 2018
1e718c4
Merge pull request #16 from kwangsooshin/master
kwangsooshin Jul 5, 2018
d4cd8b8
Dockerfile의 git clone URL을 수정함
kwangsooshin Jul 5, 2018
64f2c14
Merge pull request #17 from kwangsooshin/master
kwangsooshin Jul 5, 2018
39fe42d
Error Fixed
kwangsooshin Jul 5, 2018
acf3ae4
Merge pull request #18 from kwangsooshin/master
kwangsooshin Jul 5, 2018
025e990
Bug Fixed and Edit README.md
kwangsooshin Jul 5, 2018
866ed1b
Merge pull request #19 from kwangsooshin/master
kwangsooshin Jul 5, 2018
ed82a64
Bug fixed: Show Log when docker-compose
kwangsooshin Jul 6, 2018
1983feb
Merge pull request #20 from kwangsooshin/master
kwangsooshin Jul 6, 2018
9257cbf
Edit README.md:
kwangsooshin Jul 9, 2018
88f050e
Merge pull request #21 from kwangsooshin/master
kwangsooshin Jul 9, 2018
56797dd
Dummy Module bug fix
kwangsooshin Jul 9, 2018
e8aad34
Merge pull request #22 from kwangsooshin/master
kwangsooshin Jul 9, 2018
d116df5
Fixed Encoding adapt to Unix
kwangsooshin Jul 9, 2018
e8a067a
Add Shebang Line
kwangsooshin Jul 10, 2018
b059333
Merge pull request #23 from kwangsooshin/master
kwangsooshin Jul 10, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Analysis Module

- [Introduce](#introduce)
- [Prerequisites](#prerequisites)
- [Installation](#installation)
- [From Source](#from-source)
- [Docker Compose](#docker-compose)
Expand All @@ -17,11 +18,18 @@

Python 코드로 구성되어 있으며, Django 및 Django REST framework를 사용하여 개발하였습니다.

본 프로젝트는 [Analysis Site](https://github.com/sogang-mm/Analysis-Site)와 함께 설치하기를 추천합니다.
본 프로젝트는 [Analysis Site](https://github.com/sogang-mm/analysis-site)와 함께 설치하기를 추천합니다.

Linux 사용을 가정하여 코드를 작성하였으며, 만약 다른 환경에서의 설치를 진행하려면 문의하시기 바랍니다.


## Prerequisites

- Linux
- Python 2.7, 3.4, 3.5, or 3.6
- And so on


## Installation

### From Source
Expand Down Expand Up @@ -59,7 +67,8 @@ Docker Compose를 사용하기 위해서는 다음을 필요로 한다.
```
* 본인의 git repository로 주소를 수정한다.
```dockerfile
RUN git clone https://github.com/sogang-mm/Analysis-Module.git
RUN git clone https://github.com/sogang-mm/analysis-module.git
WORKDIR /workspace/analysis-module
```

2. .env
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RUN pip install --upgrade pip
RUN pip install setuptools

WORKDIR /workspace
RUN git clone https://github.com/sogang-mm/Analysis-Module.git
WORKDIR /workspace/Analysis-Module
RUN git clone https://github.com/sogang-mm/analysis-module.git
WORKDIR /workspace/analysis-module
RUN pip install -r requirements.txt

COPY entrypoint.sh /entrypoint.sh
Expand Down