chore: update tool version and docker-compose.yaml

suyuan32 · Apr 9, 2023 · 0ac52ce · 0ac52ce
1 parent fc777a2
commit 0ac52ce
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/deploy/docker-compose/all_in_one/docker-compose.yaml b/deploy/docker-compose/all_in_one/docker-compose.yaml
@@ -61,7 +61,7 @@ services:
           cpus: '0.05'
           memory: 200M
   core-rpc:
-    image: ryanpower/core-rpc:0.2.4
+    image: ryanpower/core-rpc-docker:v0.3.2
     container_name: core-rpc
     restart: always
     ports:
@@ -79,9 +79,28 @@ services:
         reservations:
           cpus: '0.05'
           memory: 200M
+  job-rpc:
+    image: ryanpower/job-rpc-docker:v0.3.2
+    container_name: job-rpc
+    restart: always
+    ports:
+      - '9105:9105'
+    networks:
+      simple-admin:
+        aliases:
+          - job-rpc
+        ipv4_address: 10.5.0.7
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 500M
+        reservations:
+          cpus: '0.05'
+          memory: 200M
 
   core-api:
-    image: ryanpower/core-api:0.2.4
+    image: ryanpower/core-api-docker:v0.3.2
     container_name: core-api
     restart: always
     ports:
@@ -101,7 +120,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-demo:0.2.0
+    image: ryanpower/backend-ui-docker:v0.3.2
     container_name: backend-ui
     restart: always
     ports:

diff --git a/go.mod b/go.mod
@@ -9,14 +9,14 @@ require (
 	github.com/hibiken/asynq v0.24.0
 	github.com/mojocn/base64Captcha v1.3.5
 	github.com/suyuan32/simple-admin-common v0.3.0
-	github.com/suyuan32/simple-admin-job v0.3.0
-	github.com/zeromicro/go-zero v1.5.0
+	github.com/suyuan32/simple-admin-job v0.3.2
+	github.com/zeromicro/go-zero v1.5.1
 	golang.org/x/oauth2 v0.6.0
 	google.golang.org/grpc v1.54.0
 	google.golang.org/protobuf v1.30.0
 )
 
-replace github.com/zeromicro/go-zero v1.5.0 => github.com/suyuan32/simple-admin-tools v0.3.1
+replace github.com/zeromicro/go-zero v1.5.1 => github.com/suyuan32/simple-admin-tools v0.3.2
 
 require (
 	ariga.io/atlas v0.10.0 // indirect
@@ -116,7 +116,7 @@ require (
 	golang.org/x/image v0.6.0 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -544,10 +544,10 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/suyuan32/simple-admin-common v0.3.0 h1:zAZOjL33dF//xfKCZ9iL/LYa0XI0IpvHCOpEwZYmQfg=
 github.com/suyuan32/simple-admin-common v0.3.0/go.mod h1:OV0t1VfTgGTyB8Kyv/yf0MoUhyL1m+KB0lafz7Q0bXc=
-github.com/suyuan32/simple-admin-job v0.3.0 h1:WMIshN5CdPeggyxAWzPZMUy5XQnQVSah9Ng03hAYhx8=
-github.com/suyuan32/simple-admin-job v0.3.0/go.mod h1:Apm4W19DVSQIJ+T9XlpBYfd1HQ0yX/CpYCNIHRa6BNI=
-github.com/suyuan32/simple-admin-tools v0.3.1 h1:pPbIt/W7vISTL7nkL/3i07QQ9Kk8xANqckZ58khfKdg=
-github.com/suyuan32/simple-admin-tools v0.3.1/go.mod h1:kuY5NKKOe9YDJWHuKq0oWdWYFO7eFOJCAt1Jm3YkVko=
+github.com/suyuan32/simple-admin-job v0.3.2 h1:elfLGRSAoFArstA6bKPr4quVdTmtTcFsP2+69qtYumM=
+github.com/suyuan32/simple-admin-job v0.3.2/go.mod h1:R7Cxl+C+IltsLUU861DeOjXpXmb0jHEEeAPOIhp1Q6k=
+github.com/suyuan32/simple-admin-tools v0.3.2 h1:L4n507SwZ7ifn/xNx25irSpv3451t7zDLNCO+9py2FQ=
+github.com/suyuan32/simple-admin-tools v0.3.2/go.mod h1:k4IQDPMNDIdwl/+3nHvSPrU79XTjdcooRr56LQKnY44=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
@@ -789,8 +789,9 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=