File tree 3 files changed +47
-10
lines changed
3 files changed +47
-10
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,8 @@ services:
7
7
context : GenAIComps
8
8
dockerfile : comps/text2sql/src/Dockerfile
9
9
args :
10
+ IMAGE_REPO : ${REGISTRY:-opea}
11
+ BASE_TAG : ${TAG:-latest}
10
12
http_proxy : ${http_proxy}
11
13
https_proxy : ${https_proxy}
12
14
no_proxy : ${no_proxy}
@@ -16,8 +18,6 @@ services:
16
18
context : ../ui
17
19
dockerfile : ./docker/Dockerfile.react
18
20
args :
19
- http_proxy : ${http_proxy}
20
- https_proxy : ${https_proxy}
21
- no_proxy : ${no_proxy}
22
21
texttosql_url : ${build_texttosql_url}
22
+ expends : text2sql
23
23
image : ${REGISTRY:-opea}/text2sql-react-ui:${TAG:-latest}
Original file line number Diff line number Diff line change 4
4
5
5
set -xe
6
6
7
+ IMAGE_REPO=${IMAGE_REPO:- " opea" }
8
+ IMAGE_TAG=${IMAGE_TAG:- " latest" }
9
+ echo " REGISTRY=IMAGE_REPO=${IMAGE_REPO} "
10
+ echo " TAG=IMAGE_TAG=${IMAGE_TAG} "
11
+ export REGISTRY=${IMAGE_REPO}
12
+ export TAG=${IMAGE_TAG}
13
+
7
14
WORKPATH=$( dirname " $PWD " )
8
15
LOG_PATH=" $WORKPATH /tests"
9
16
ip_address=$( hostname -I | awk ' {print $1}' )
@@ -95,16 +102,31 @@ function stop_docker() {
95
102
96
103
function main() {
97
104
105
+ echo " ::group::stop_docker"
98
106
stop_docker
107
+ echo " ::endgroup::"
108
+
109
+ echo " ::group::build_docker_images"
110
+ if [[ " $IMAGE_REPO " == " opea" ]]; then build_docker_images; fi
111
+ echo " ::endgroup::"
112
+
113
+ echo " ::group::start_services"
114
+ start_services
115
+ echo " ::endgroup::"
99
116
100
- build_docker_images
101
- start_service
102
- sleep 10s
117
+ echo " ::group::validate_microservice"
103
118
validate_microservice
119
+ echo " ::endgroup::"
120
+
121
+ echo " ::group::validate_frontend"
104
122
validate_frontend
123
+ echo " ::endgroup::"
105
124
125
+ echo " ::group::stop_docker"
106
126
stop_docker
107
- echo y | docker system prune
127
+ echo " ::endgroup::"
128
+
129
+ docker system prune -f
108
130
109
131
}
110
132
Original file line number Diff line number Diff line change @@ -101,16 +101,31 @@ function stop_docker() {
101
101
102
102
function main() {
103
103
104
+ echo " ::group::stop_docker"
104
105
stop_docker
106
+ echo " ::endgroup::"
105
107
106
- build_docker_images
107
- start_service
108
+ echo " ::group::build_docker_images"
109
+ if [[ " $IMAGE_REPO " == " opea" ]]; then build_docker_images; fi
110
+ echo " ::endgroup::"
108
111
112
+ echo " ::group::start_services"
113
+ start_services
114
+ echo " ::endgroup::"
115
+
116
+ echo " ::group::validate_microservice"
109
117
validate_microservice
118
+ echo " ::endgroup::"
119
+
120
+ echo " ::group::validate_frontend"
110
121
validate_frontend
122
+ echo " ::endgroup::"
111
123
124
+ echo " ::group::stop_docker"
112
125
stop_docker
113
- echo y | docker system prune
126
+ echo " ::endgroup::"
127
+
128
+ docker system prune -f
114
129
115
130
}
116
131
You can’t perform that action at this time.
0 commit comments