Merge branch 'master' into enhancement/document-sort-order

Author: batslyadams

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+---
+name: "\U0001F4AC Question"
+about: For the question to confirm suspiciously behaviors or feature usage. Please use StackOverflow if your question is general usage or help with your environment
+
+---
+
+How to reproduce the behaviour
+---------
+<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
+
+<!--
+Include a code example or the steps that led to the problem. Please try to be as specific as possible. -->
+
+Your Environment
+---------
+<!-- Include details of your environment. -->
+
+*   Operating System:
+*   Python Version Used:
+*   When you install doccano:
+*   How did you install doccano (Heroku button etc):

.github/ISSUE_TEMPLATE/01-question.md

@@ -0,0 +1,19 @@
+---
+name: "\U0001F6A8 Bug Report"
+about: For the bug report or unexpected behavior differing from the docs
+
+---
+
+How to reproduce the behaviour
+---------
+<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
+
+<!-- Include a code example or the steps that led to the problem. Please try to be as specific as possible. -->
+
+Your Environment
+---------
+<!-- Include details of your environment.-->
+*   Operating System:
+*   Python Version Used:
+*   When you install doccano:
+*   How did you install doccano (Heroku button etc):

.github/ISSUE_TEMPLATE/02-bug.md

@@ -0,0 +1,23 @@
+---
+name: "\U000023F3 Installation Problem"
+about: For the problem that you faced when installing doccano which none of the suggestions in the docs and other issues helped
+
+---
+
+<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
+
+How to reproduce the problem
+---------
+<!-- Include the details of how the problem occurred. Which option did you choose to install doccano? Did you come across an error? What else did you try? -->
+
+```bash
+# copy-paste the error message here
+```
+
+Your Environment
+---------
+<!-- Include details of your environment.-->
+*   Operating System:
+*   Python Version Used:
+*   When you install doccano:
+*   How did you install doccano (Heroku button etc):

.github/ISSUE_TEMPLATE/03-install.md

@@ -0,0 +1,9 @@
+---
+name: "\U0001F381 Feature Request"
+about: For the proposal to improve or enhance doccano
+
+---
+
+Feature description
+---------
+<!-- Please describe the feature: Which area of the library is it related to? What specific solution would you like? -->

.github/ISSUE_TEMPLATE/04-request.md

@@ -198,3 +198,5 @@ pip-selfcheck.json
 node_modules/
 bundle/
 webpack-stats.json
+
+.vscode

.gitignore

@@ -6,6 +6,7 @@ python:
 env:
   - DATABASE=sqlite
   - DATABASE=postgres
+  - DATABASE=mssql
 
 services:
   - docker
@@ -16,6 +17,11 @@ before_install:
     if [[ "${DATABASE}" = "postgres" ]]; then
       docker run --rm --name=postgres --network=doccano -d -e POSTGRES_USER=user -e POSTGRES_PASSWORD=pass -e POSTGRES_DB=db postgres
       export DATABASE_URL="postgres://user:pass@postgres:5432/db?sslmode=disable"
+
+    elif [[ "${DATABASE}" = "mssql" ]]; then
+      docker run --rm --name=mssql --network=doccano -d -e ACCEPT_EULA=y -e SA_PASSWORD=sUp3rS3cr3t mcr.microsoft.com/mssql/server:2017-latest
+      docker exec -it mssql sh -c "while ! /opt/mssql-tools/bin/sqlcmd -U SA -P sUp3rS3cr3t -Q 'CREATE DATABASE db;'; do sleep 3; done"
+      export DATABASE_URL="mssql://SA:sUp3rS3cr3t@mssql:1433/db?sslmode=disable"
     fi
 
 install:
@@ -25,7 +31,7 @@ script:
   - docker build --target=builder --tag=doccano-test .
   - >
     if [[ "${DATABASE}" != "sqlite" ]]; then
-      docker run --network doccano -e DATABASE_URL="${DATABASE_URL}" -it doccano-test sh -c 'app/manage.py migrate && app/manage.py test api.tests server.tests'
+      docker run --network doccano -e DATABASE_URL="${DATABASE_URL}" -it doccano-test sh -c 'app/manage.py wait_for_db && app/manage.py migrate && app/manage.py test api.tests server.tests'
     fi
 
 before_deploy:
@@ -35,16 +41,19 @@ deploy:
   - provider: script
     script: tools/cd.sh travis-${TRAVIS_BUILD_NUMBER}
     on:
+      repo: chakki-works/doccano
       branch: master
 
   - provider: script
     script: tools/cd.sh ${TRAVIS_TAG}
     on:
+      repo: chakki-works/doccano
       tags: true
 
   - provider: pages
     skip_cleanup: true
     github_token: $GITHUB_TOKEN
     local_dir: site
     on:
+        repo: chakki-works/doccano
         branch: master

.travis.yml

@@ -4,10 +4,10 @@ FROM python:${PYTHON_VERSION}-stretch AS builder
 ARG NODE_VERSION="8.x"
 RUN curl -sL "https://deb.nodesource.com/setup_${NODE_VERSION}" | bash - \
  && apt-get install --no-install-recommends -y \
-      nodejs=8.16.0-1nodesource1
+      nodejs
 
-RUN apt-get install --no-install-recommends -y \
-      unixodbc-dev=2.3.4-1
+COPY tools/install-mssql.sh /doccano/tools/install-mssql.sh
+RUN /doccano/tools/install-mssql.sh --dev
 
 COPY app/server/static/package*.json /doccano/app/server/static/
 RUN cd /doccano/app/server/static \
@@ -33,19 +33,8 @@ RUN cd /doccano \
 
 FROM python:${PYTHON_VERSION}-slim-stretch AS runtime
 
-RUN apt-get update \
- && apt-get install --no-install-recommends -y \
-      curl=7.52.1-5+deb9u9 \
-      gnupg=2.1.18-8~deb9u4 \
-      apt-transport-https=1.4.9 \
- && curl -fsS https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
- && curl -fsS https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql.list \
- && apt-get update \
- && ACCEPT_EULA=Y apt-get install --no-install-recommends -y \
-      msodbcsql17=17.3.1.1-1 \
-      mssql-tools=17.3.0.1-1 \
- && apt-get remove -y curl gnupg apt-transport-https \
- && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /doccano/tools/install-mssql.sh /doccano/tools/install-mssql.sh
+RUN /doccano/tools/install-mssql.sh
 
 RUN useradd -ms /bin/sh doccano