diff --git a/.gitignore b/.gitignore index 99c25e6..645db1f 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ data /.idea/modules.xml /.idea/open-renamer.iml /.idea/vcs.xml + +package-lock.json \ No newline at end of file diff --git a/build.sh b/build.sh index 6d1b032..9af628f 100644 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ base=$(cd "$(dirname "$0")";pwd) cd $base docker run -it --rm --name buildOpenRenamer --user ${UID} -v $base/openRenamerFront:/opt/front node:lts-buster-slim bash -c "cd /opt/front && yarn --registry https://registry.npmmirror.com && yarn build" -docker run -it --rm --name buildOpenRenamer --user ${UID} -v $base/openRenamerBackend:/opt/app node:lts-buster-slim bash -c "cd /opt/app && yarn --registry https://registry.npmmirror.com && yarn global add typescript && yarn && tsc" +docker run -it --rm --name buildOpenRenamer --user ${UID} -v $base/openRenamerBackend:/opt/app node:lts-buster-slim bash -c "cd /opt/app && npm config set registry https://registry.npmmirror.com && npm install -g typescript && npm install && tsc" rm -rf openRenamerBackend/static/* touch openRenamerBackend/static/.gitkeep @@ -12,4 +12,4 @@ rm -rf openRenamerBackend/node_modules # 单平台打包并推送 #docker build -t fleyx/open-renamer:$0 --push . # 多平台打包并推送 -docker buildx build -t fleyx/open-renamer:$1 --platform linux/amd64,linux/arm64 --push . \ No newline at end of file +docker buildx build -t fleyx/open-renamer:$1 --platform linux/amd64,linux/arm64 --push . diff --git a/openRenamerBackend/start.sh b/openRenamerBackend/start.sh index 2f3380f..e1029a2 100644 --- a/openRenamerBackend/start.sh +++ b/openRenamerBackend/start.sh @@ -1 +1 @@ -npm install && tsc && node dist/index.js \ No newline at end of file +npm install && node dist/index.js