From 36d2b6aa9e036897c95740a3f6337e81b3286978 Mon Sep 17 00:00:00 2001 From: Alexander Kurakin Date: Tue, 5 May 2020 14:00:16 +0300 Subject: [PATCH 1/2] Update rebuild FAQ We should also remove `doccano_node_modules`, `doccano_venv` volumes on remove since doccano's dependencies could change. --- docs/faq.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 7a49f846..d68b890f 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -40,7 +40,6 @@ local doccano_postgres_data local doccano_static_volume local doccano_venv local doccano_www -❯ docker volume rm doccano_www -❯ docker volume rm doccano_static_volume +❯ docker volume rm doccano_node_modules doccano_static_volume doccano_venv doccano_www ❯ docker-compose -f docker-compose.prod.yml build --no-cache ``` From 77a7d740d4f97f2b9a7b398fd00488ec7f17014f Mon Sep 17 00:00:00 2001 From: Alexander Kurakin Date: Sat, 2 May 2020 19:10:25 +0300 Subject: [PATCH 2/2] Update README.md More concrete instructions about setting the superuser account credentials. --- README.md | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 71b76cf8..125da129 100644 --- a/README.md +++ b/README.md @@ -28,17 +28,29 @@ You can try the [annotation demo](http://doccano.herokuapp.com). Two options to run doccano: -- Production -- Development +- production, +- development. -In any case, you need Docker and Docker Compose. Anyway, you need to clone the repository: +To use doccano, please follow: + +### Install dependencies + +You need to install dependencies: + +- [Git](https://git-scm.com), +- [Docker](https://www.docker.com), +- [Docker Compose](https://docs.docker.com/compose). + +### Get the code + +You need to clone the repository: ```bash $ git clone https://github.com/doccano/doccano.git $ cd doccano ``` -_Note for Windows developers: Be sure to configure git to correctly handle line endings or you may encounter `status code 127` errors while running the services in future steps. Running with the git config options below will ensure your git directory correctly handles line endings._ +_Note for Windows developers:_ Be sure to configure git to correctly handle line endings or you may encounter `status code 127` errors while running the services in future steps. Running with the git config options below will ensure your git directory correctly handles line endings. ```bash git clone https://github.com/doccano/doccano.git --config core.autocrlf=input @@ -46,20 +58,20 @@ git clone https://github.com/doccano/doccano.git --config core.autocrlf=input ### Production -```bash -$ docker-compose -f docker-compose.prod.yml up -``` - -Go to . - -Note the superuser account credentials located in the `docker-compose.prod.yml` file: +Set the superuser account credentials in the `docker-compose.prod.yml` file: ```yml ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "password" ``` -> Note: If you want to add annotators, see [Frequently Asked Questions](./docs/faq.md) +Run doccano: + +```bash +$ docker-compose -f docker-compose.prod.yml up +``` + +Go to .