Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2020-1-capstone-design1/Triz_Project1

@@ -9,12 +9,12 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 
-ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ]
+ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "300s" ]
 
 
-COPY package*.json ./ 
+COPY package*.json ./
 COPY prisma ./prisma/
 COPY prisma ./prisma/
 
 
 RUN npm install && npx prisma generate
 RUN npm install && npx prisma generate
 CMD ["npm","start"]
 CMD ["npm","start"]
 
 
-COPY . .
\ No newline at end of file
+COPY . .

@@ -9,8 +9,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 
-ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ]
+ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "300s" ]
 
 
 COPY ./ ./prisma/
 COPY ./ ./prisma/
 
 
-CMD ["prisma", "studio", "--experimental"]
\ No newline at end of file
+CMD ["prisma", "studio", "--experimental"]

@@ -22,7 +22,4 @@ class KhuIcon extends Component {
   }
   }
 }
 }
 
 
-export default {
-  HelloKhu,
-  KhuIcon
-}
+