Bladeren bron

app apply docker

abiao 4 jaren geleden
bovenliggende
commit
7a6f995335

+ 20 - 0
go/gopath/Dockerfile

@@ -0,0 +1,20 @@
+# Version: 0.1
+
+FROM registry.cn-shenzhen.aliyuncs.com/hiwavo_public/golang:1.14 as builder
+
+ARG CI_COMMIT_TAG
+ENV CI_COMMIT_TAG=$CI_COMMIT_TAG
+ENV GOPATH=/data/apps/fohow
+
+ADD .. /data/apps/fohow/
+RUN cd /data/apps/fohow/src/fohow.com && make 
+
+FROM registry.cn-shenzhen.aliyuncs.com/hiwavo/hiwavo-msbase:centos-7.8.2003r2
+
+COPY --from=builder /data/apps/fohow/src/fohow.com /data/apps/fohow/src/fohow.com
+
+ENV GOPATH=/data/apps/fohow.com
+
+WORKDIR /data/apps/fohow/src/fohow.com
+
+CMD sh start.sh

+ 26 - 0
go/gopath/build.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# 项目名称(镜像名称)
+project_name='fohow_api'
+# 获取项目版本号
+eval project_version=`jq .version ./src/fohow.com/conf/version.json`
+# 获取git提交id
+#git_commit_id=`git log -1 --pretty=format:%h`
+git_commit_id=`date +%s`
+# 定义镜像标签
+#images_tag="${project_version}-${git_commit_id}"
+images_tag="latest"
+# 仓库地址
+images_hub='registry.cn-shenzhen.aliyuncs.com/fohow'
+
+# 构建镜像
+docker build --build-arg CI_COMMIT_TAG=${images_tag} -t ${images_hub}/${project_name}:${images_tag} .
+# 登录仓库
+#docker login ${images_hub}
+# 上传镜像
+docker push ${images_hub}/${project_name}:${images_tag}
+
+# 镜像清理
+docker rmi $(docker images -q -f dangling=true)
+
+echo "${images_hub}/${project_name}:${images_tag}"

+ 1 - 1
go/gopath/src/fohow.com/conf/app.conf

@@ -59,7 +59,7 @@ AliDaYuAppSecret = "089035706ec0ea30c065ef42a1b07bb7"
 AliSmsAccessId = "LTAI4G53r9fk8UtmWo7P9Qxy"
 AliSmsAccessSecret = "jTjeHIaZ6cei0ZOfmuSxQKdlRRlxh7"
 
-MysqlMaster = root:fohow123!@#@tcp(127.0.0.1:3306)/test_fohow?charset=utf8&parseTime=true
+MysqlMaster = root:fohow123!@#@tcp(47.52.141.54:3306)/test_fohow?charset=utf8&parseTime=true
 
 #WkhtmltoimgBinPath = "C:/Program Files/wkhtmltopdf/bin/wkhtmltoimage.exe"
 WkhtmltoimgBinPath = /opt/software/wkhtmltox/bin/wkhtmltoimage

+ 8 - 0
go/gopath/src/fohow.com/conf/fohow_super.conf

@@ -0,0 +1,8 @@
+[program:fohowapi]
+directory = /data/apps/fohow/src/fohow.com
+command = /data/apps/fohow/src/fohow.com/fohowmall.com
+autostart = true
+startsecs = 5
+user = root
+redirect_stderr = true
+stdout_logfile = /data/apps/fohow/src/fohow.com/logs/docker_api.log

+ 3 - 0
go/gopath/src/fohow.com/conf/version.json

@@ -0,0 +1,3 @@
+{
+  "version": "v0.0.2"
+}

+ 2 - 0
go/gopath/src/fohow.com/main.go

@@ -21,6 +21,8 @@ func init() {
 	if beego.AppConfig.String("RunMode") == "dev" {
 		orm.SetMaxIdleConns("default", 1)
 		orm.SetMaxOpenConns("default", 2)
+		//beego.SetLogger("file",`{"filename":"logs/test.log","level":7,"maxlines":0,"maxsize":0,"daily":true,"maxdays":10}`)
+		//beego.BeeLogger.DelLogger("console")
 	} else {
 		orm.SetMaxIdleConns("default", 50)
 		orm.SetMaxOpenConns("default", 100)

+ 2 - 0
go/gopath/src/fohow.com/start.sh

@@ -0,0 +1,2 @@
+cd /data/apps/fohow/src/fohow.com/conf && mv fohow_super.conf /etc/supervisord.conf.d/ && supervisord -c /etc/supervisord.conf \
+&& supervisorctl restart fohowapi && tail -f /data/apps/fohow/src/fohow.com/logs/docker_api.log