2020-1-capstone-design1 / Triz_Project1

Go to a project
Toggle navigation Toggle navigation pinning
minsung
c86ab014 1 parent a5c2cce8

change delay

Inline Side-by-side
Showing 2 changed files with 0 additions and 8 deletions
...@@ -9,11 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,11 +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 -<<<<<<< HEAD
13 ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ] 12 ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ]
14 -=======
15 -ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ]
16 ->>>>>>> 81d693438b3dd8e67a7daefac47486362f102999
17 13
18 COPY package*.json ./ 14 COPY package*.json ./
19 COPY prisma ./prisma/ 15 COPY prisma ./prisma/
......
...@@ -9,11 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI ...@@ -9,11 +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 -<<<<<<< HEAD
13 ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ] 12 ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ]
14 -=======
15 -ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "60s" ]
16 ->>>>>>> 81d693438b3dd8e67a7daefac47486362f102999
17 13
18 COPY ./ ./prisma/ 14 COPY ./ ./prisma/
19 15
......