1、修改下载docker-compose 2、修改压缩docker相关基础包压缩失败问题3、修改tsg-diagnose.service

.gitlab-ci.yml

@@ -42,6 +42,7 @@ cache:
   before_script:
     - mkdir -p rpm-docker/docker-ce && mkdir -p rpm-docker/docker-compose
     - yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
+    - yum -y install epel-release
   tags:
   - share
   only:
@@ -68,7 +69,7 @@ docker_rpm_get:
   extends: .get_docker_rpm
   script:
     - yum install docker-ce --downloadonly --downloaddir=./rpm-docker/docker-ce
-    - yum install docker-ce --downloadonly --downloaddir=./rpm-docker/docker-compose
+    - yum install docker-compose --downloadonly --downloaddir=./rpm-docker/docker-compose
 
 rpm_build:
   stage: upload

ci/travis.sh

@@ -34,7 +34,7 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 if [ -n "${DOCKER_CE_RPM_UPLOAD}" ]; then
-	tar -zcvf ${VER_NAME} docker-rpm-${VER_NAME}.tar.gz ./rpm-docker
+	tar -zcvf docker-rpm-${VER_NAME}.tar.gz ./rpm-docker
 	python3 file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} *.tar.gz
 fi
 

docker-compose/tsg-diagnose.service

@@ -7,8 +7,8 @@ After=docker.service
 Type=oneshot
 RemainAfterExit=yes
 WorkingDirectory=/opt/tsg/tsg-diagnose/compose/%i
-ExecStart=/usr/local/bin/docker-compose up -d  --remove-orphans
-ExecStop=/usr/local/bin/docker-compose down --remove-orphans
+ExecStart=/bin/sh -c "docker-compose up -d  --remove-orphans"
+ExecStop=/bin/sh -c "docker-compose down --remove-orphans"
 
 [Install]
 WantedBy=multi-user.target