Skip to content

Commit b5978ca

Browse files
tscuitetscuite
authored
隐藏actios错误提示，Update docker-compose.yaml (flipped-aurora#946)
* 隐藏actios错误提示 * Update docker-compose.yaml
1 parent 53f5c48 commit b5978ca

File tree

3 files changed

+127
-115
lines changed

3 files changed

+127
-115
lines changed

‎.github/workflows/docker build.yaml

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎.github/workflows/docker_build.yaml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
name: GIN-VUE-ADMIN Docker Build
2+
3+
on:
4+
push:
5+
branches: [stopstopstop]
6+
#workflow_dispatch:
7+
# inputs:
8+
# webtag:
9+
# description: 'Set web tag, Default latest'
10+
# required: true
11+
# default: "latest"
12+
# servertag:
13+
# description: 'Set server tag, Default latest'
14+
# required: true
15+
# default: "latest"
16+
17+
jobs:
18+
GIN_VUE_ADMIN_WEB:
19+
name: GIN VUE ADMIN WEB
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Private Actions Checkout
23+
uses: actions/checkout@v2.3.4
24+
- name: Docker Setup QEMU
25+
uses: docker/setup-qemu-action@v1.2.0
26+
- name: Docker Setup Buildx
27+
uses: docker/setup-buildx-action@v1.6.0
28+
- name: Docker Login
29+
uses: docker/login-action@v1.10.0
30+
with:
31+
username: ${{ secrets.DOCKERHUB_USERNAME }}
32+
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
- name: Docker Login in Aliyun
34+
uses: docker/login-action@v1.10.0
35+
with:
36+
registry: ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}
37+
username: ${{ secrets.DOCKERHUB_ACCOUNT_ALIYUN }}
38+
password: ${{ secrets.DOCKERHUB_PASSWORD_ALIYUN }}
39+
- name: Build and push Docker images
40+
uses: docker/build-push-action@v2.7.0
41+
with:
42+
context: .
43+
# 这里是适配 arm64 ，主要看你们的程序是否支持 arm64
44+
platforms: linux/amd64,linux/arm64
45+
file: web/Dockerfile
46+
push: true
47+
# 这里是给docker 打标签，默认不上传 latest
48+
tags: |
49+
${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}
50+
${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}/${{ secrets.DOCKERHUB_USERNAME_ALIYUN }}web:${{ github.event.inputs.webtag }}
51+
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}.cache
52+
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}.cache,mode=max
53+
# 漏洞扫描
54+
- name: Scan for vulnerabilities
55+
uses: crazy-max/ghaction-container-scan@v1
56+
with:
57+
image: ${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}
58+
dockerfile: web/Dockerfile
59+
# 更新 docker 描述页面
60+
- name: Docker Hub Description
61+
uses: peter-evans/dockerhub-description@v2
62+
with:
63+
username: ${{ secrets.DOCKERHUB_USERNAME }}
64+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
65+
repository: ${{ secrets.DOCKERHUB_USERNAME }}/web
66+
67+
GIN_VUE_ADMIN_SERVER:
68+
name: GIN VUE ADMIN SERVER
69+
runs-on: ubuntu-latest
70+
steps:
71+
- name: Private Actions Checkout
72+
uses: actions/checkout@v2.3.4
73+
- name: Docker Setup QEMU
74+
uses: docker/setup-qemu-action@v1.2.0
75+
- name: Docker Setup Buildx
76+
uses: docker/setup-buildx-action@v1.6.0
77+
- name: Docker Login
78+
uses: docker/login-action@v1.10.0
79+
with:
80+
username: ${{ secrets.DOCKERHUB_USERNAME }}
81+
password: ${{ secrets.DOCKERHUB_TOKEN }}
82+
- name: Docker Login in Aliyun
83+
uses: docker/login-action@v1.10.0
84+
with:
85+
registry: ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}
86+
username: ${{ secrets.DOCKERHUB_ACCOUNT_ALIYUN }}
87+
password: ${{ secrets.DOCKERHUB_PASSWORD_ALIYUN }}
88+
- name: Build and push Docker images
89+
uses: docker/build-push-action@v2.7.0
90+
with:
91+
context: .
92+
# 这里是适配 arm64 ，主要看你们的程序是否支持 arm64
93+
platforms: linux/amd64,linux/arm64
94+
file: server/Dockerfile
95+
push: true
96+
# 这里是给docker 打标签，默认不上传 latest
97+
tags: |
98+
${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}
99+
${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}/${{ secrets.DOCKERHUB_USERNAME_ALIYUN }}server:${{ github.event.inputs.servertag }}
100+
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}.cache
101+
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}.cache,mode=max
102+
# 漏洞扫描
103+
- name: Scan for vulnerabilities
104+
uses: crazy-max/ghaction-container-scan@v1
105+
with:
106+
image: ${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}
107+
dockerfile: server/Dockerfile
108+
# 更新 docker 描述页面
109+
- name: Docker Hub Description
110+
uses: peter-evans/dockerhub-description@v2
111+
with:
112+
username: ${{ secrets.DOCKERHUB_USERNAME }}
113+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
114+
repository: ${{ secrets.DOCKERHUB_USERNAME }}/server

‎docker-compose.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
version: "3"
22

3+
# 声明一个名为network的networks,subnet为network的子网地址,默认网关是177.7.0.1
34
networks:
45
network:
56
ipam:
67
driver: default
78
config:
89
- subnet: '177.7.0.0/16'
9-
10+
11+
# 设置mysql，redis持久化保存
12+
volumes:
13+
mysql:
14+
redis:
15+
1016
services:
1117
web:
1218
build:
@@ -42,7 +48,7 @@ services:
4248
ipv4_address: 177.7.0.12
4349

4450
mysql:
45-
image: mysql:8.0.21
51+
image: mysql:8.0.21 # 如果您是 arm64 架构：如 MacOS 的 M1，请修改镜像为 image: mysql/mysql-server:8.0.21
4652
container_name: gva-mysql
4753
command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
4854
restart: always
@@ -51,6 +57,8 @@ services:
5157
environment:
5258
MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
5359
MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
60+
volumes:
61+
- mysql:/var/lib/mysql
5462
networks:
5563
network:
5664
ipv4_address: 177.7.0.13
@@ -61,6 +69,8 @@ services:
6169
restart: always
6270
ports:
6371
- '16379:6379'
72+
volumes:
73+
- redis:/data
6474
networks:
6575
network:
66-
ipv4_address: 177.7.0.14
76+
ipv4_address: 177.7.0.14

0 commit comments

Comments
 (0)