From ebcefa1c05b1a7c5f414346e5c42c9e2cef7ec20 Mon Sep 17 00:00:00 2001
From: ras0q <ras0q@users.noreply.github.com>
Date: Sat, 13 May 2023 21:19:28 +0900
Subject: [PATCH] :recycle: create frontend dist only in container

---
 .air.toml          |  2 +-
 .dockerignore      |  9 +++------
 Dockerfile.dev     | 10 ++++++++--
 docker-compose.yml |  3 +--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.air.toml b/.air.toml
index 18b9c567..a211cb6b 100644
--- a/.air.toml
+++ b/.air.toml
@@ -7,7 +7,7 @@ tmp_dir = "tmp"
   bin = "./tmp/main"
   cmd = "go build -o ./tmp/main ."
   delay = 0
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_dir = ["development", "docs", "tmp"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false
diff --git a/.dockerignore b/.dockerignore
index 4afabf55..853e20fb 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,13 +1,10 @@
-/vendor/
 .git
 .gitignore
 .gitmodules
 .dockerignore
 .DS_Store
+development
+docs
+tmp
 README.md
-room
-service.json
 
-/development/
-/web/node_modules
-/web/dist
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 03141b79..74b6fa32 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -5,12 +5,18 @@
 FROM golang:1.20.4-alpine
 WORKDIR /srv/knoq
 
-RUN go install github.com/cosmtrek/air@latest
-
 COPY go.mod ./
 COPY go.sum ./
 ENV GO111MODULE=on
 RUN go mod download
 COPY ./ ./
 
+RUN mkdir -p ./web/dist \
+  && apk add --no-cache curl \
+  && curl -L -Ss https://github.com/traPtitech/knoQ-UI/releases/latest/download/dist.tar.gz \
+  | tar zxv -C ./web
+RUN touch ./service.json
+
+RUN go install github.com/cosmtrek/air@latest
+
 ENTRYPOINT ["air", "-c", ".air.toml"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 35a14099..58494a38 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ version: "3"
 networks:
   default:
 
+
 services:
   knoq:
     build:
@@ -36,8 +37,6 @@ services:
       - ./presentation:/srv/knoq/presentation
       - ./usecase:/srv/knoq/usecase
       - ./parsing:/srv/knoq/parsing
-      - ./development/dist:/srv/knoq/web/dist
-      - ./development/service.json:/srv/knoq/service.json
     ports:
       - "6006:3000"
     depends_on: