Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #45

Merged
merged 1 commit into from
Mar 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ services:
environment:
- npm_config_unsafe_perm=true
# 这里的命令优先级比较高,会自动覆盖镜像里面的命令
command: npm run serve
command: npm run dev
restart: always
jvue-admin:
privileged: true
Expand Down
2 changes: 1 addition & 1 deletion jvue-admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM node:10.15.1-alpine
WORKDIR /app

# 安装依赖
COPY ./jvue-front/package.json ./
COPY ./jvue-admin/package.json ./

# 因为被墙,单独安装
ENV SASS_BINARY_SITE https://npm.taobao.org/mirrors/node-sass
Expand Down
1 change: 0 additions & 1 deletion jvue-front/build/build.dev.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
npm run clean &&^
npm run dev-build &&^
move %cd%\dist\index.html %cd%\dist\index.ssr.html &&^
%cd%\build\cpm.cmd &&^
echo "build for development success."
1 change: 0 additions & 1 deletion jvue-front/build/build.dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ pwd
npm run clean
npm run dev-build
mv dist/index.html dist/index.ssr.html
build/cpm.sh
echo "build for development success."
1 change: 0 additions & 1 deletion jvue-front/build/build.prod.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
npm run clean &&^
npm run build &&^
move %cd%\dist\index.html %cd%\dist\index.ssr.html &&^
%cd%\build\cpm.cmd &&^
echo "build for production success."
1 change: 0 additions & 1 deletion jvue-front/build/build.prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
npm run clean
npm run build
mv dist/index.html dist/index.ssr.html
build/cpm.sh
echo "build for production success."
58 changes: 0 additions & 58 deletions jvue-front/build/cpm.cmd

This file was deleted.

59 changes: 0 additions & 59 deletions jvue-front/build/cpm.sh

This file was deleted.

1 change: 1 addition & 0 deletions jvue-front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"clean": "rimraf dist",
"lint": "vue-cli-service lint",
"serve": "cross-env NODE_ENV=development vue-cli-service serve --port 3000",
"dev":"npm run clean && npm run dev-build && mv dist/index.html dist/index.ssr.html && npm run dev-start",
"dev-build-entry-client": "cross-env SSR_ENV=client vue-cli-service build --mode development",
"build-entry-client": "cross-env SSR_ENV=client vue-cli-service build",
"dev-build-entry-server": "cross-env SSR_ENV=server vue-cli-service build --mode development --no-clean",
Expand Down