abiao 4 роки тому
батько
коміт
3f25b377c9
4 змінених файлів з 34 додано та 5 видалено
  1. 3 0
      Dockerfile
  2. 0 5
      buid_admin .sh
  3. 28 0
      build.sh
  4. 3 0
      config/version.json

+ 3 - 0
Dockerfile

@@ -1,6 +1,8 @@
 # Version: 0.1
 FROM registry.cn-hongkong.aliyuncs.com/hiwavo/rails_env
 
+ARG CI_COMMIT_TAG
+ENV CI_COMMIT_TAG=$CI_COMMIT_TAG
 ENV PATH /root/.rbenv/bin:$PATH
 ADD ./ /home/rails/fohow/admin
 WORKDIR /home/rails/fohow/admin
@@ -8,3 +10,4 @@ CMD rbenv exec bundle exec sh run_unicorn_docker.sh start
 
 
 
+

+ 0 - 5
buid_admin .sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-docker build -t registry.cn-hongkong.aliyuncs.com/hiwavo/fohow_admin:latest .
-docker push registry.cn-hongkong.aliyuncs.com/hiwavo/fohow_admin:latest
-
-

+ 28 - 0
build.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# 项目名称(镜像名称)
+project_name='fohow-admin'
+# 获取项目版本号
+eval project_version=`jq .version ./config/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}"
+

+ 3 - 0
config/version.json

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