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

删除从docker registy 拉取 docker image

Browse Source
This commit is contained in:
fumingwei
2020-07-20 14:22:51 +08:00
parent d383c85211
commit 4614c325f6
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@@ -5,7 +5,7 @@ stages:
cache:
key: "$CI_COMMIT_REF_SLUG"
paths:
- build
- images
.build_docker_images:
image: docker:stable
@@ -31,9 +31,6 @@ cache:
- ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
- cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
- chmod +x ./ci/travis.sh
script:
- yum makecache
- ./ci/travis.sh
tags:
- share
@@ -47,12 +44,11 @@ images_build:
script:
- mkdir build
- docker build -t $UNITTEST_IMAGE_TAG -f ./unittest_python/Dockerfile ./unittest_python/
- docker save $UNITTEST_IMAGE_TAG > build/unittest.tar
- docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
- docker build -t $WPR_IMAGE_TAG -f ./wpr_golang/Dockerfile ./wpr_golang/
- docker save $UNITTEST_IMAGE_TAG > build/wpr.tar
- docker save $UNITTEST_IMAGE_TAG > images/wpr.tar
- docker build -t $BADSSL_IMAGE_TAG -f ./badssl.com/Dockerfile ./badssl.com/
- docker save $BADSSL_IMAGE_TAG > build/badssl.tar
- pwd && ls -halt ./* && ls -halt ./build
- docker save $BADSSL_IMAGE_TAG > images/badssl.tar
rpm_build:
stage: upload
@@ -63,8 +59,7 @@ rpm_build:
PULP3_DIST_NAME: tsg-stable-x86_64.el7
extends: .build_rpm
script:
- pwd && ls -halt ./*
- ls -halt ./build
- ./ci/travis.sh
dependencies:
- images_build
only:

13
ci/travis.sh
View File

@@ -34,19 +34,6 @@ env | sort
: "${COMPILER_IS_GNUCXX:=OFF}"
mkdir build || true
mkdir images || true
if [ -n "${PACKAGE}" ]; then
docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest
docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest
docker pull git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest
docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/unittest:latest unittest-self-test:latest
docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/wpr:latest wpr-self-test:latest
docker tag git.mesalab.cn:7443/tsg/tsg-diagnose/badssl:latest badssl-self-test:latest
docker save unittest-self-test:latest > images/unittest.tar
docker save wpr-self-test:latest > images/wpr.tar
docker save badssl-self-test:latest > images/badssl.tar
fi
cd build