Skip to content

Commit

Permalink
[fix] rm memcached in base image
Browse files Browse the repository at this point in the history
1. remove memcached in base image
2. revert entrypoint.sh

Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
  • Loading branch information
Cyber-SiKu authored and SeanHai committed Jan 6, 2023
1 parent 7f89d09 commit 740debe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
4 changes: 0 additions & 4 deletions curvefs/docker/debian9/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions docker/debian9/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 740debe

Please sign in to comment.