适配PULP3版本

3 files changed, 4 insertions, 21 deletions

diff --git a/Dockerfile b/Dockerfile
index 55293cf..e6ada7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,11 @@
 FROM centos:7
 
 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 && \
-    yum install -y pulp-admin-client pulp-rpm-admin-extensions pulp-puppet-admin-extensions pulp-docker-admin-extensions && \
-    yum install -y python-pip && \
-    pip install -i https://mirrors.aliyun.com/pypi/simple/ --no-cache-dir cmake && \
+    yum install -y cmake3 && \
+    yum install -y python3-pip && \
+    pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple httpie && \
     curl -sL https://sentry.io/get-cli/ | bash && \
     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
-ADD docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/bin/bash"]
\ No newline at end of file
+CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100755
index 669f976..0000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-socat UNIX-RECV:/dev/log,mode=666 STDOUT &
-/usr/bin/goferd
-exec "$@"
diff --git a/repo.mesalab.cn.conf b/repo.mesalab.cn.conf
deleted file mode 100644
index 7c6c070..0000000
--- a/repo.mesalab.cn.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[server]
-host: repo.mesalab.cn
-port: 443