Skip to content

Commit

Permalink
dev: add lock cmd and move proxy in
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangxu19830126 committed Apr 2, 2019
1 parent 5c82b74 commit b975af9
Show file tree
Hide file tree
Showing 182 changed files with 29,772 additions and 15,753 deletions.
13 changes: 6 additions & 7 deletions Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
FROM deepfabric/build as builder

RUN go get github.com/deepfabric/elasticell-proxy;exit 0

WORKDIR /root/go/src/github.com/deepfabric/elasticell-proxy
COPY . /root/go/src/github.com/deepfabric/elasticell
WORKDIR /root/go/src/github.com/deepfabric/elasticell

RUN make proxy

FROM alpine:latest

COPY --from=builder /root/go/src/github.com/deepfabric/elasticell-proxy/dist/redis-proxy /usr/local/bin/redis-proxy
COPY --from=builder /root/go/src/github.com/deepfabric/elasticell/dist/proxy /usr/local/bin/proxy

RUN mkdir -p /var/redis-proxy/
RUN mkdir -p /var/lib/redis-proxy/
RUN mkdir -p /var/proxy/
RUN mkdir -p /var/lib/proxy/
RUN apk update
RUN apk add bind-tools wget netcat-openbsd

Expand All @@ -22,4 +21,4 @@ RUN apk add bind-tools wget netcat-openbsd
RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf

# Define default command.
ENTRYPOINT ["/usr/local/bin/redis-proxy"]
ENTRYPOINT ["/usr/local/bin/proxy"]
8 changes: 1 addition & 7 deletions Dockerfile-quickstart
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,11 @@ COPY . /root/go/src/github.com/deepfabric/elasticell
WORKDIR /root/go/src/github.com/deepfabric/elasticell
RUN make release

FROM deepfabric/build as builder_proxy

RUN git clone https://github.com/deepfabric/elasticell-proxy /root/go/src/github.com/deepfabric/elasticell-proxy
WORKDIR /root/go/src/github.com/deepfabric/elasticell-proxy
RUN make

FROM deepfabric/centos

COPY --from=builder /root/go/src/github.com/deepfabric/elasticell/dist/cell /usr/local/bin/cell
COPY --from=builder /root/go/src/github.com/deepfabric/elasticell/dist/pd /usr/local/bin/pd
COPY --from=builder_proxy /root/go/src/github.com/deepfabric/elasticell-proxy/dist/redis-proxy /usr/local/bin/redis-proxy
COPY --from=builder /root/go/src/github.com/deepfabric/elasticell/dist/proxy /usr/local/bin/proxy

RUN mkdir -p /apps/deepfabric/cfg \
&& mkdir -p /apps/deepfabric/log \
Expand Down
Loading

0 comments on commit b975af9

Please sign in to comment.