diff --git a/.gitignore b/.gitignore index 35fc111..99c25e6 100644 --- a/.gitignore +++ b/.gitignore @@ -103,4 +103,8 @@ dist # TernJS port file .tern-port -data \ No newline at end of file +data +/.idea/.gitignore +/.idea/modules.xml +/.idea/open-renamer.iml +/.idea/vcs.xml diff --git a/Dockerfile b/Dockerfile index d5eeda3..874282c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,6 @@ FROM node:lts-buster-slim WORKDIR /app copy ./openRenamerBackend /app ENV PORT 80 -CMD ["/usr/local/bin/node", "dist/index.js"] +CMD ["bash", "start.sh"] diff --git a/build.sh b/build.sh index fa96a2e..c31015e 100644 --- a/build.sh +++ b/build.sh @@ -7,7 +7,5 @@ rm -rf openRenamerBackend/static/* touch openRenamerBackend/static/.gitkeep mv openRenamerFront/dist/* openRenamerBackend/static -docker run -it --rm --name buildOpenRenamer --user ${UID} -v $base/openRenamerBackend:/opt/backend node:lts-buster-slim bash -c "cd /opt/backend && yarn config set registry https://registry.npm.taobao.org && yarn global add typescript && yarn && tsc" - # docker镜像打包 # docker build -t fleyx/open-renamer:0.3 . \ No newline at end of file diff --git a/openRenamerBackend/start.sh b/openRenamerBackend/start.sh new file mode 100644 index 0000000..94f481f --- /dev/null +++ b/openRenamerBackend/start.sh @@ -0,0 +1 @@ +yarn config set registry https://registry.npm.taobao.org && yarn global add typescript && yarn && tsc && node dist/index.js \ No newline at end of file