diff options
| author | Lu Qiuwen <[email protected]> | 2019-08-30 20:41:09 +0800 |
|---|---|---|
| committer | Lu Qiuwen <[email protected]> | 2019-08-30 20:41:09 +0800 |
| commit | 6913bc4eceac36c0c9ba10bb387bcc0905ca6e12 (patch) | |
| tree | 2af363aa269145208c7e4aee074581518484fc11 | |
| parent | d4774bc3ab67bbed0c686044dad3bb2f5cd72f41 (diff) | |
改用映射docker socket的方式编译镜像
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4daa4dd..6ac734b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,14 @@ image: docker:stable -services: - - docker:18.09.7-dind - variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG +before_script: + - docker info + build: stage: build script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build -t $IMAGE_TAG . - docker push $IMAGE_TAG tags: @@ -1,6 +1,6 @@ FROM centos:7 -RUN yum install -y gcc gcc-c++ make libpcap-devel epel-release patch wget socat automake autoconf rpm-build && \ +RUN yum install -y gcc gcc-c++ make libpcap-devel epel-release patch wget socat automake autoconf rpm-build git && \ wget https://repos.fedorapeople.org/repos/pulp/pulp/rhel-pulp.repo -O /etc/yum.repos.d/rhel-pulp.repo && \ yum install -y pulp-consumer-client pulp-rpm-consumer-extensions pulp-puppet-consumer-extensions pulp-agent && \ yum install -y pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid && \ |