2020-1-capstone-design1 / Triz_Project1

Go to a project
Toggle navigation Toggle navigation pinning
sdy
9692548b 2 parents d9e2afc0 da33a5a3

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

Inline Side-by-side
Showing 6 changed files with 3 additions and 6 deletions
...@@ -9,7 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,7 +9,7 @@ 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/
......
...@@ -9,7 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,7 +9,7 @@ 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
......
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 -}
......