From 541f26c8d8fd71085bd04118a896deb4698c3c16 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Tue, 15 Feb 2022 15:21:30 +0900
Subject: [PATCH] Move Dockerfile to docker directory

---
 .github/workflows/publish-image.yml | 2 +-
 Dockerfile => docker/Dockerfile     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename Dockerfile => docker/Dockerfile (96%)

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index fe54ba89..f989c554 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -45,7 +45,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile
+          file: ./docker/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 96%
rename from Dockerfile
rename to docker/Dockerfile
index 3eec661f..2205e855 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ ARG PYTHON_VERSION="3.8.12-slim-buster"
 ARG NODE_VERSION="16.5-alpine3.14"
 FROM node:${NODE_VERSION} AS frontend-builder
 
-COPY frontend/ /frontend/
+COPY ../frontend /frontend/
 WORKDIR /frontend
 ENV PUBLIC_PATH="/static/_nuxt/"
 
@@ -55,7 +55,7 @@ RUN pip install --no-cache-dir -U pip \
  && pip install --no-cache-dir /deps/*.whl \
  && rm -rf /deps
 
-COPY --chown=doccano:doccano . /doccano
+COPY --chown=doccano:doccano .. /doccano
 WORKDIR /doccano/backend
 COPY --from=frontend-builder /frontend/dist /doccano/backend/client/dist
 RUN python manage.py collectstatic --noinput