Skip to content

Commit 05edac7

Browse files
committed
feat(workflow): simplify dongtai-mysql workflow by removing unnecessary services and optimizing build steps
1 parent ec04c3d commit 05edac7

File tree

2 files changed

+12951
-34
lines changed

2 files changed

+12951
-34
lines changed

.github/workflows/release_base_image.yaml

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ jobs:
4040
run: |
4141
TAG_NAME=${{ github.event.release.tag_name }}
4242
ID=`echo ${TAG_NAME##v}`
43-
echo "::set-output name=version::$ID"
43+
# 修正为新语法
44+
echo "version=$ID" >> $GITHUB_OUTPUT
4445
4546
- name: Build and push logstash
4647
uses: docker/build-push-action@v3
@@ -49,7 +50,7 @@ jobs:
4950
file: ./logstash/Dockerfile
5051
push: true
5152
platforms: linux/amd64,linux/arm64
52-
tags: |
53+
tags: |
5354
dongtai/dongtai-logstash:${{ steps.release.outputs.version }}
5455
dongtai/dongtai-logstash:latest
5556
@@ -60,7 +61,7 @@ jobs:
6061
file: ./logrotate/Dockerfile
6162
push: true
6263
platforms: linux/amd64,linux/arm64
63-
tags: |
64+
tags: |
6465
dongtai/dongtai-logrotate:${{ steps.release.outputs.version }}
6566
dongtai/dongtai-logrotate:latest
6667
@@ -70,7 +71,7 @@ jobs:
7071
context: ./redis
7172
push: true
7273
platforms: linux/amd64,linux/arm64
73-
tags: |
74+
tags: |
7475
dongtai/dongtai-redis:${{ steps.release.outputs.version }}
7576
dongtai/dongtai-redis:latest
7677
@@ -82,23 +83,14 @@ jobs:
8283

8384
dongtai-mysql:
8485
name: dongtai-mysql
85-
# needs:
86-
# - Release-DongTai-Infra-Service
8786
runs-on: ubuntu-latest
88-
services:
89-
dongtai-mysql:
90-
image: dongtai/dongtai-mysql:latest
91-
ports:
92-
- 3306:3306
93-
dongtai-redis:
94-
image: dongtai/dongtai-redis:latest
95-
ports:
96-
- 6379:6379
9787
steps:
9888
- name: Checkout
9989
uses: actions/checkout@v3
90+
10091
- name: Set up QEMU
10192
uses: docker/setup-qemu-action@v2
93+
10294
- name: Set up Docker Buildx
10395
uses: docker/setup-buildx-action@v2
10496

@@ -119,38 +111,29 @@ jobs:
119111
run: |
120112
TAG_NAME=${{ github.event.release.tag_name }}
121113
ID=`echo ${TAG_NAME##v}`
122-
echo "::set-output name=version::$ID"
114+
# 修正为新语法
115+
echo "version=$ID" >> $GITHUB_OUTPUT
123116
124-
- name: Build Mysql only schema to local
125-
working-directory: ./mysql
126-
run: |
127-
docker pull wukong.tencentcloudcr.com/dongtai/dongtai-server:${{ steps.release.outputs.version }}
128-
docker run -i --name dongtai-server-update -v $(pwd)/config-tutorial.ini:/opt/dongtai/dongtai_conf/conf/config.ini --rm --link `docker ps | grep dongtai-mysql | awk '{print $1}'`:dongtai-mysql \
129-
--link `docker ps | grep dongtai-redis | awk '{print $1}'`:dongtai-redis \
130-
--network ${{ job.container.network }} wukong.tencentcloudcr.com/dongtai/dongtai-server:${{ steps.release.outputs.version }} migrate || exit 1
131-
docker exec -i `docker ps | grep dongtai-mysql | awk '{print $1}'` /bin/bash -c "mysqldump dongtai_webapi -u root -p'dongtai-iast' --single-transaction" > dongtai-mysql-schema.sql || exit 1
132-
133-
134-
- name: Build Mysql only schema to local
117+
- name: Build and push Mysql (5.7)
135118
uses: docker/build-push-action@v3
136119
with:
137120
context: ./mysql
138121
push: true
139-
#platforms: linux/amd64,linux/arm64
140-
tags: |
122+
# platforms: linux/amd64,linux/arm64
123+
tags: |
141124
dongtai/dongtai-mysql:${{ steps.release.outputs.version }}
142-
# dongtai/dongtai-mysql:latest
143-
125+
144126
- name: Install Mysql 8.0
145127
working-directory: ./mysql
146128
run: |
147129
sed -i 's#5.7#8.0#g' Dockerfile
148-
- name: Build Mysql 8.0
130+
131+
- name: Build and push Mysql 8.0
149132
uses: docker/build-push-action@v3
150133
with:
151134
context: ./mysql
152135
push: true
153136
platforms: linux/amd64,linux/arm64
154-
tags: |
137+
tags: |
155138
dongtai/dongtai-mysql-8:${{ steps.release.outputs.version }}
156-
dongtai/dongtai-mysql-8:latest
139+
dongtai/dongtai-mysql-8:latest

0 commit comments

Comments
 (0)