minsung

overwrite

...@@ -9,12 +9,12 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,12 +9,12 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
9 && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ 9 && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
10 && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz 10 && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
11 11
12 -ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ] 12 +ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "300s" ]
13 13
14 -COPY package*.json ./ 14 +COPY package*.json ./
15 COPY prisma ./prisma/ 15 COPY prisma ./prisma/
16 16
17 RUN npm install && npx prisma generate 17 RUN npm install && npx prisma generate
18 CMD ["npm","start"] 18 CMD ["npm","start"]
19 19
20 -COPY . .
...\ No newline at end of file ...\ No newline at end of file
20 +COPY . .
......
...@@ -9,8 +9,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,8 +9,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
9 && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ 9 && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
10 && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz 10 && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
11 11
12 -ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ] 12 +ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "300s" ]
13 13
14 COPY ./ ./prisma/ 14 COPY ./ ./prisma/
15 15
16 -CMD ["prisma", "studio", "--experimental"]
...\ No newline at end of file ...\ No newline at end of file
16 +CMD ["prisma", "studio", "--experimental"]
......
1 import React from "react"; 1 import React from "react";
2 import styled from "styled-components"; 2 import styled from "styled-components";
3 -import { parse, format } from "date-fns"; 3 +//import { parse, format } from "date-fns";
4 4
5 const MessageWrapper = styled.div` 5 const MessageWrapper = styled.div`
6 display: flex; 6 display: flex;
......
...@@ -9,7 +9,7 @@ import { ...@@ -9,7 +9,7 @@ import {
9 } from "./ChatQueries"; 9 } from "./ChatQueries";
10 import useInput from "../../Hooks/useInput"; 10 import useInput from "../../Hooks/useInput";
11 import { toast } from "react-toastify"; 11 import { toast } from "react-toastify";
12 -import defaultProfile from "../imgs/defaultProfile.jpg"; 12 +//import defaultProfile from "../imgs/defaultProfile.jpg";
13 13
14 export default withRouter(({ location }) => { 14 export default withRouter(({ location }) => {
15 const { pathname } = location; 15 const { pathname } = location;
......
No preview for this file type
...@@ -22,7 +22,4 @@ class KhuIcon extends Component { ...@@ -22,7 +22,4 @@ class KhuIcon extends Component {
22 } 22 }
23 } 23 }
24 24
25 -export default { 25 +
26 - HelloKhu,
27 - KhuIcon
28 -}
......