Skip to content

Commit 1a4d3d6

Browse files
author
爱吃抹茶不吃茶
committed
feat: 修改Dockerfile,新增本地快速构建脚本
1 parent 9f5f50a commit 1a4d3d6

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
##
22
## 服务名: JavaScriptCollection
3-
## IP范围: 172.30.0.100
3+
## IP范围: 172.30.0.200
44
##
55
version: '2'
66
services:
@@ -12,7 +12,7 @@ services:
1212
- "7100:80"
1313
networks:
1414
net:
15-
ipv4_address: 172.30.0.100
15+
ipv4_address: 172.30.0.200
1616

1717
## 创建桥接网络
1818
networks:

scripts/build_image.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ run(){
3434
echo -e "${successLogger}---------------- shell ${projectName} start ---------------- "
3535
if [ "${isFaster}" == "faster" ];then
3636
## 本地构建、快速制作镜像
37-
# npm run build &&
38-
docker build -f Faster.Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" .
37+
npm run build && docker build -f Faster.Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" .
3938
else
4039
## ci流程构建
4140
docker build -f Dockerfile --build-arg APP_VERSION="${version}" -t "${imageTagName}" .

scripts/deploy.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ deploy_JavaScriptCollection(){
9999
echo -e "${successLogger}---------------- deploy ${containerName} start ---------------- "
100100

101101
docker run -d --name "${containerName}" \
102-
-p 0.0.0.0:7200:80 \
102+
-p 0.0.0.0:7100:80 \
103103
--network="${networkName}" \
104104
--restart=unless-stopped \
105105
--ip=172.30.0.200 \

scripts/page_deploy.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ if [ "${commitInfo}" -eq "" ]; then
2020
commitInfo="JavaScriptCollection Init"
2121
fi
2222

23-
git commit -m "refactor:${commitInfo}"
23+
## 配置个人信息
24+
git config user.name "吃芝士葡萄的妹妹"
25+
git config user.email "fairy_vip@2925.com"
2426

27+
git commit -m "refactor:${commitInfo}"
2528

26-
## 配置个人信息
27-
git config user.name "喜欢吃芝士葡萄的妹妹"
28-
git config user.email "fairy0115@2925.com"
2929

3030
# if you are deploying to https://<USERNAME>.github.io
3131
# git push -f git@github.com:<USERNAME>/<USERNAME>.github.io.git master
3232

3333
# if you are deploying to https://<USERNAME>.github.io/<REPO>
34-
git push -f https://github.com/mmdapl/JavaScriptCollection.git master:pages/github
34+
git push -f https://github.com/142vip/JavaScriptCollection.git main:pages/github
3535

3636

3737
cd -

0 commit comments

Comments
 (0)