diff options
| author | Lu Qiuwen <[email protected]> | 2019-08-29 14:58:45 +0800 |
|---|---|---|
| committer | Lu Qiuwen <[email protected]> | 2019-08-29 14:58:45 +0800 |
| commit | 810dd3b3fe060e5c4dd3923237457e10dedc6df6 (patch) | |
| tree | c5053bbd43e591bcc1c5bc9878c4643fb9c273ec | |
| parent | 3f45f6f5c3c8b89ced712abfd7c949b0e374933b (diff) | |
调整Dockerfile，增加必要的软件包，清除临时文件。
| -rw-r--r-- | Dockerfile | 12 | ||||
| -rw-r--r-- | pulp.yml | 19 |
2 files changed, 7 insertions, 24 deletions
@@ -1,10 +1,12 @@ FROM centos:7 -RUN yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm wget socat && \ +RUN yum install -y gcc gcc-c++ make libpcap-devel epel-release patch wget socat && \ 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 \ - pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid && \ - yum install -y pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions + 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 && \ + yum install -y pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions && \ + yum clean all && \ + rm -rf /var/cache/yum ADD repo.mesalab.cn.conf /etc/pulp/consumer/conf.d/repo.mesalab.cn.conf ADD repo.mesalab.cn.conf /etc/pulp/admin/conf.d/repo.mesalab.cn.conf @@ -12,4 +14,4 @@ ADD docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["/bin/bash"] +CMD ["/bin/bash"]
\ No newline at end of file diff --git a/pulp.yml b/pulp.yml deleted file mode 100644 index 0cc25aa..0000000 --- a/pulp.yml +++ /dev/null @@ -1,19 +0,0 @@ -.pulp-startup: - variables: - PULP_SERVER_HOST: repo.mesalab.cn - PULP_SERVER_PORT: 443 - - before_script: - - yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm wget - - 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 pulp-rpm-handlers pulp-rpm-yumplugins pulp-puppet-handlers python-gofer-qpid - - yum install pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions - - echo "[server]" >> consumer.conf.tmpfile - - echo "host: $PULP_SERVER_HOST" >> consumer.conf.tmpfile - - echo "port: $PULP_SERVER_PORT" >> consumer.conf.tmpfile - - mv consumer.conf.tmpfile /etc/pulp/consumer/conf.d/server.conf - - echo "[server]" >> admin.conf.tmpfile - - echo "host: $PULP_SERVER_HOST" >> admin.conf.tmpfile - - echo "port: $PULP_SERVER_PORT" >> admin.conf.tmpfile - - mv admin.conf.tmpfile /etc/pulp/admin/conf.d/server.conf - - /usr/bin/goferd |