Skip to content

Commit 0f844a7

Browse files
committed
修复docker启动问题
1 parent 0316275 commit 0f844a7

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ USER nextjs
1919

2020
EXPOSE 3000
2121

22-
CMD ["node", "index.js"]
22+
CMD ["pm2-runtime", "start", "index.js", "--name", "runtime_tracker"]

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ services:
2424
- "${PORT:-3000}:3000"
2525
environment:
2626
- PORT=3000
27-
- SECRET=${SECRET}
2827
- MONGODB_URI=${MONGODB_URI:-mongodb://admin:password@mongodb:27017/deviceStats?authSource=admin}
28+
volumes:
29+
- ./.env:/app/.env
2930
depends_on:
3031
mongodb:
3132
condition: service_healthy

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const PORT = process.env.PORT || 3000;
1010
const SECRET = process.env.SECRET || 'default-secret-key';
1111
const MONGODB_URI = process.env.MONGODB_URI || 'mongodb://localhost:27017/deviceStats';
1212
const ADMIN_USER = process.env.ADMIN_USER || 'admin';
13-
const ADMIN_PASSWD = process.env.ADMIN_PASSWD?.replace(/\$\$/g, '$') || '';
13+
const ADMIN_PASSWD = process.env.ADMIN_PASSWD || 'admin';
1414

1515
//运行信息
1616
console.log('后端端口 ', PORT);

routes/adminRoutes.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ router.post('/account/update', authenticateToken, async (req, res) => {
153153
// 更新密码(加密后保存)
154154
if (password) {
155155
const hashedPassword = await bcrypt.hash(password, 10);
156-
// Docker Compose 需要双美元符号转义
157-
const escapedPassword = hashedPassword.replace(/\$/g, '$$$$');
158-
envMap.set('ADMIN_PASSWD', escapedPassword);
156+
envMap.set('ADMIN_PASSWD', hashedPassword);
159157
process.env.ADMIN_PASSWD = hashedPassword;
160158
updatedFields.push('密码');
161159
}

0 commit comments

Comments
 (0)