Browse Source

update docker local dev env

Chris Lu 5 years ago
parent
commit
ca4ca1ae6f
3 changed files with 12 additions and 12 deletions
  1. 3 9
      docker/Dockerfile.go_build
  2. 8 0
      docker/Makefile
  3. 1 3
      docker/README.md

+ 3 - 9
docker/Dockerfile.go_build

@@ -1,15 +1,9 @@
-FROM frolvlad/alpine-glibc as builder
-RUN apk add git go g++
-RUN mkdir -p /go/src/github.com/chrislusf/
-RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs
-RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install
-
 FROM alpine AS final
 LABEL author="Chris Lu"
-COPY --from=builder /root/go/bin/weed /usr/bin/
+COPY  ./weed /usr/bin/
 RUN mkdir -p /etc/seaweedfs
-COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml
-COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh
+COPY ./filer.toml /etc/seaweedfs/filer.toml
+COPY ./entrypoint.sh /entrypoint.sh
 
 # volume server gprc port
 EXPOSE 18080

+ 8 - 0
docker/Makefile

@@ -0,0 +1,8 @@
+all: gen
+
+.PHONY : gen
+
+gen:
+	cd ../weed; GOOS=linux go build; mv weed ../docker/
+	docker-compose -f local-dev-compose.yml -p seaweedfs up
+	rm ./weed

+ 1 - 3
docker/README.md

@@ -25,7 +25,5 @@ docker-compose -f seaweedfs-dev-compose.yml -p seaweedfs up
 
 ```bash
 cd $GOPATH/src/github.com/chrislusf/seaweedfs/docker
-
-docker-compose -f local-dev-compose.yml -p seaweedfs up
-
+make
 ```