Commit a371015be7c75357f6ce667918f2ec889ffb4c06
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
Showing
1 changed file
with
1 additions
and
6 deletions
DOCKERFILE
| @@ -42,11 +42,6 @@ RUN npm install && \ | @@ -42,11 +42,6 @@ RUN npm install && \ | ||
| 42 | cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \ | 42 | cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \ |
| 43 | cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml | 43 | cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml |
| 44 | 44 | ||
| 45 | -RUN npm install && \ | ||
| 46 | - npm run build && \ | ||
| 47 | - mkdir -p /opt/wvp/config && \ | ||
| 48 | - cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml | ||
| 49 | - | ||
| 50 | # wvp打包 | 45 | # wvp打包 |
| 51 | WORKDIR /home/wvp-GB28181 | 46 | WORKDIR /home/wvp-GB28181 |
| 52 | RUN mvn compile && \ | 47 | RUN mvn compile && \ |
| @@ -129,4 +124,4 @@ RUN apt-get update && \ | @@ -129,4 +124,4 @@ RUN apt-get update && \ | ||
| 129 | 124 | ||
| 130 | WORKDIR /opt/wvp | 125 | WORKDIR /opt/wvp |
| 131 | COPY --from=build /opt /opt | 126 | COPY --from=build /opt /opt |
| 132 | -CMD ["sh", "run.sh"] | ||
| 133 | \ No newline at end of file | 127 | \ No newline at end of file |
| 128 | +CMD ["sh", "run.sh"] |