Skip to content

Commit

Permalink
Release 0.2.0 (#162)
Browse files Browse the repository at this point in the history
* add log of admin [order route travel] service

* feat add admin order/route/travel/user auth basic user service log

* feat add Config Consign/Price/Execute/Food/Payment Service log

* add rest logs

* add REPO var

* fix 调整部分测试用例

* fix 修改了k8s部署文件镜像到kagaya85

* feat 增加NODE_IP环境变量注入

* modify header to null

* food,inside,order,order-other的head修改为null

* by fzq

* remove headers from ts-consign-price-service、ts-consign-service、ts-contacts-service、ts-execute-service、ts-food-map-service

* delete headers

* delete headers

* update HttpEntityconstructor in travel2,user,vcode and voucher

* modify header

* modify base image

* remove jaeger

* add agent

* update header

* Revert: modify header (a2723d2)

* Revert: delete headers (d76fcf7)

* Revert: food,inside,order,order-other的head修改为null (7c6c317)

* Revert: remove headers from ts-consign-service(fc4f90c)

* add sw_ctx

* modify part2.yml

* modify part3.yml

* modify part2.yml: increase cpu and memory

* add build_upload_image.py

* add authorization header in cancelFromOrder

* add authorization header in drawbackmoney

* add authorization header in ts-cancel-service

* test "data not null" in ts-cancel-service

* move "order.setStatus" to the method inside.

* add async call in some services using rabbitmq

* bugfix(ui):fix the food bug,default food type is 0

* fix bugs in ts-rebook-service: add authorization header

* fix log format

* Add async call using rabbitmq.  (#1)

Modify ts-food-service , send food order info by mq to delivery service now.
Add ts-delivery-service.
Modify preserve and preserve-other service's send mail part into async
Modify ts-notification-service, it pull emails from mq and then send it
Modify K8s deploy files

* using images in docker hub

* remove skywalking from docker images

* remove skywalking settings in dockerfile

* remove developers' image repo in config files

* remove logback.xml

* using offical rabbitmq image

Co-authored-by: Kagaya <[email protected]>
Co-authored-by: unknown <[email protected]>
Co-authored-by: zhongyuanzhao000 <[email protected]>
Co-authored-by: zhongyuanzhao000 <[email protected]>
Co-authored-by: xywu <[email protected]>
Co-authored-by: HumbertZhang <[email protected]>
Co-authored-by: z__cx <[email protected]>
Co-authored-by: LeBW <[email protected]>
Co-authored-by: AkasakaIsami <[email protected]>
Co-authored-by: WangShang <[email protected]>
Co-authored-by: Humbert Zhang <[email protected]>
  • Loading branch information
12 people authored Aug 5, 2021
1 parent 813dd01 commit e5ae0c3
Show file tree
Hide file tree
Showing 193 changed files with 3,554 additions and 2,027 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# define env config
NAMESPACE=codewisdom
TAG=0.1.0
IMG_REPO=codewisdom
IMG_TAG=0.2.0
64 changes: 64 additions & 0 deletions build_upload_image.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import os

PREFIX = "codewisdom"
VERSION = "0.2.0"

base_path = os.getcwd()
build_paths = []


def main():
if not mvn_build():
print("mvn build failed")
init_docker_build_paths()
# docker_login()
docker_build_and_push()


def mvn_build():
mvn_status = os.system("mvn clean package -DskipTests")
return mvn_status == 0


def init_docker_build_paths():
list_paths = os.listdir(os.getcwd())
for p in list_paths:
if os.path.isdir(p):
if(p.startswith("ts-")):
build_path=base_path + "/" + p
build_paths.append(build_path)


def docker_login():
username = os.getenv("DOCKER_USERNAME")
docker_hub_address = os.getenv("DOCKER_HUB_ADDRESS") or "registry.cn-hangzhou.aliyuncs.com"
print(f"[DOCKER HUB LOGIN] login username:{username} address:{docker_hub_address}")
print(f"[DOCKER HUB LOGIN] You should input your root password first and then dockerhub password")
docker_login = os.system(f"sudo docker login --username={username} {docker_hub_address}")
if not docker_login:
print("docker login failed")


def docker_build_and_push():
for build_path in build_paths:
image_name = build_path.split("/")[-1]

os.chdir(build_path)
files = os.listdir(build_path)
if "Dockerfile" in files:
docker_build = os.system(f"sudo docker build . -t {PREFIX}/{image_name}:{VERSION}")
if docker_build != 0:
print("[FAIL]" + image_name + " build failed.")
else:
print("[SUCCESS]" + image_name + " build success.")

docker_push = os.system(f"sudo docker push {PREFIX}/{image_name}:{VERSION}")
if docker_push != 0:
print("[FAIL]" + image_name + " push failed.")
else:
print("[SUCCESS]" + image_name + " push success.")


if __name__ == '__main__':
main()

Loading

0 comments on commit e5ae0c3

Please sign in to comment.