From ff023ba7ec3c5c29a3a34fd0b521ed25f4cd706f Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 11 Dec 2020 08:49:03 +0900
Subject: [PATCH 1/3] Improve build speed

---
 app/Dockerfile          | 18 ++++++++++++------
 docker-compose.prod.yml |  3 +--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index add30d71..dbb3549d 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:3.9.6
+ARG PYTHON_VERSION="3.8.6"
+FROM python:${PYTHON_VERSION}-slim-buster
 
 CMD ["python3"]
 
@@ -9,8 +10,13 @@ ENV PYTHONUNBUFFERED 1
 
 COPY . /app/
 
-RUN apk add -U --no-cache bash python3 python3-dev libpq postgresql-dev unixodbc-dev musl-dev g++ libffi-dev \
-  && pip3 install --upgrade --no-cache-dir pip setuptools \
-  && pip3 install --no-cache-dir -r requirements.txt \
-  && ln -s /usr/bin/python3 /usr/bin/python \
-  && apk del --no-cache python3-dev postgresql-dev unixodbc-dev musl-dev g++ libffi-dev
+# hadolint ignore=DL3013
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+    netcat=1.10-41.1 \
+    libpq-dev=11.9-0+deb10u1 \
+    unixodbc-dev=2.3.6-0.1 \
+    g++=4:8.3.0-1 \
+ && pip install --no-cache-dir -U pip setuptools \
+ && pip install --no-cache-dir -r requirements.txt \
+ && apt-get clean
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 803ed28c..aa1c230d 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -23,10 +23,9 @@ services:
     build: ./frontend
     environment:
       API_URL: "http://backend:8000"
+      GOOGLE_TRACKING_ID: ""
     volumes:
       - www:/app/dist
-    environment:
-      GOOGLE_TRACKING_ID: ""
 
   nginx:
     build: ./nginx

From 36740a569edd43e35005577bd35311eadd7f54f4 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 11 Dec 2020 08:49:20 +0900
Subject: [PATCH 2/3] Update python version on development environment

---
 docker-compose.dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 34bb7eac..89e648cb 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
 
   backend:
-    image: python:3.6
+    image: python:3.8.6-buster
     volumes:
       - .:/src
       - venv:/src/venv

From 461812d57028b129987333974dc834598b6d0df5 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 11 Dec 2020 08:49:53 +0900
Subject: [PATCH 3/3] Delete docker-compose.yml to avoid using it

---
 docker-compose.yml | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 9b419489..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: "3"
-services:
-
-  django:
-    image: python:3.6
-    volumes:
-      - .:/src
-      - venv:/src/venv
-    command: ["/src/tools/dev-django.sh", "0.0.0.0:8000"]
-    environment:
-      ADMIN_USERNAME: "admin"
-      ADMIN_PASSWORD: "password"
-      ADMIN_EMAIL: "admin@example.com"
-      DATABASE_URL: "postgres://doccano:doccano@postgres:5432/doccano?sslmode=disable"
-      ALLOW_SIGNUP: "False" 
-    ports:
-      - 8000:8000
-
-  webpack:
-    image: node:8
-    volumes:
-      - .:/src
-      - node_modules:/src/app/server/static/node_modules
-    command: ["/src/tools/dev-webpack.sh"]
-    environment:
-      WEBPACK_HOST: "0.0.0.0"
-      WEBPACK_PORT: "8080"
-      WEBPACK_POLL_MILLIS: "1000"
-    ports:
-      - 8080:8080
-
-  postgres:
-    image: postgres:9.6
-    environment:
-      POSTGRES_USER: "doccano"
-      POSTGRES_PASSWORD: "doccano"
-      POSTGRES_DB: "doccano"
-    ports:
-      - 5432:5432
-
-volumes:
-  node_modules:
-  venv: