gfwleak/tsg-tsg-diagnose
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fumingwei
2020-07-21 11:19:03 +08:00
parent be96df867a
commit 90f5835f27
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

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

2
ci/travis.sh
View File

@@ -34,7 +34,7 @@ env | sort
: "${COMPILER_IS_GNUCXX:=OFF}" : "${COMPILER_IS_GNUCXX:=OFF}"
if [ -n "${DOCKER_CE_RPM_UPLOAD}" ]; then 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 python3 file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} *.tar.gz
fi fi

4
docker-compose/tsg-diagnose.service
View File

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