From 740debe08b44ed16bd9205ac4b2f2d15bc9f9974 Mon Sep 17 00:00:00 2001 From: Cyber-SiKu Date: Fri, 6 Jan 2023 10:01:46 +0800 Subject: [PATCH] [fix] rm memcached in base image 1. remove memcached in base image 2. revert entrypoint.sh Signed-off-by: Cyber-SiKu --- curvefs/docker/debian9/entrypoint.sh | 4 ---- docker/debian9/base/Dockerfile | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/curvefs/docker/debian9/entrypoint.sh b/curvefs/docker/debian9/entrypoint.sh index 62a8700fa8..e95e09ed6d 100755 --- a/curvefs/docker/debian9/entrypoint.sh +++ b/curvefs/docker/debian9/entrypoint.sh @@ -91,10 +91,6 @@ function prepare() { g_binary="python3" g_start_args="target_json.py" ;; - memcached) - g_prefix="/memcached" - g_binary="memcached" - ;; *) usage exit 1 diff --git a/docker/debian9/base/Dockerfile b/docker/debian9/base/Dockerfile index b029cce2dd..d3f9bd79de 100644 --- a/docker/debian9/base/Dockerfile +++ b/docker/debian9/base/Dockerfile @@ -1,4 +1,4 @@ -FROM opencurvedocker/curve-base:debian9 +FROM debian:9 RUN echo "deb http://mirrors.163.com/debian/ stretch main\n" \ "deb http://mirrors.163.com/debian/ stretch-updates main non-free contrib\n" \ @@ -30,12 +30,6 @@ RUN echo "deb http://mirrors.163.com/debian/ stretch main\n" \ python \ wget \ python3 \ - libevent-dev \ - && wget https://curve-build.nos-eastchina1.126.net/memcache/memcached-1.6.17.tar.gz \ - && tar xvf memcached-1.6.17.tar.gz && cd memcached-1.6.17/ \ - && ./configure && make && make install \ - && cd / && rm -rf memcached-1.6.17/ memcached-1.6.17.tar.gz \ - && mkdir -p /memcached/data \ && wget https://curve-build.nos-eastchina1.126.net/curve-base.tar.gz \ && tar -xzvf curve-base.tar.gz \ && mv fusermount3 /usr/local/bin \